bzr push into mysql-trunk-merge branch (jon.hauglid:3275 to 3276)

[Jon Olav Hauglid]

 3276 Jon Olav Hauglid	2010-10-19 [merge]
      Merge from mysql-5.5-bugteam to mysql-trunk-merge
      No conflicts

    modified:
      dbug/dbug.c
 3275 Tor Didriksen	2010-10-19 [merge]
      automerge from 5.5-bugteam

    modified:
      CMakeLists.txt
      config/ac-macros/maintainer.m4
      configure.in
      dbug/dbug.c
=== modified file 'dbug/dbug.c'
--- a/dbug/dbug.c	2010-10-19 07:29:08 +0000
+++ b/dbug/dbug.c	2010-10-19 08:42:38 +0000
@@ -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);
 }
 

No bundle (reason: useless for push emails).