Merge from mysql-5.1-bugteam to mysql-5.5-bugteam

No conflicts
2010-10-19 10:30:26 +02:00 · 2010-10-19 10:30:26 +02:00 · 772385313e
commit 772385313e
parent d96afd26c9 6da8a65bf0
1 changed files with 1 additions and 0 deletions
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@ -905,6 +905,7 @@ void _db_set_init_(const char *control)
  CODE_STATE tmp_cs;
  bzero((uchar*) &tmp_cs, sizeof(tmp_cs));
  tmp_cs.stack= &init_settings;
+  tmp_cs.process= db_process ? db_process : "dbug";
  DbugParse(&tmp_cs, control);
 }