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

jhauglid · jhauglid · commit 772385313e83 · 2010-10-19T10:30:26.000+02:00
No conflicts
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -905,6 +905,7 @@ void _db_set_init_(const char *control)`
`905`	`905`	`CODE_STATE tmp_cs;`
`906`	`906`	`bzero((uchar*) &tmp_cs, sizeof(tmp_cs));`
`907`	`907`	`tmp_cs.stack= &init_settings;`
	`908`	`+ tmp_cs.process= db_process ? db_process : "dbug";`
`908`	`909`	`DbugParse(&tmp_cs, control);`
`909`	`910`	`}`
`910`	`911`