bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3156)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@stripped2tsic

 3156 Magnus Blåudd	2011-01-27
      ndb
       - move the setting of thd->proc_info out of the function  code logic
       - use the_proc_info macro for setting and getting the proc_info

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-01-27 12:48:55 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-01-27 13:04:41 +0000
@@ -3404,13 +3404,13 @@ static int
 ndb_binlog_index_table__open(THD *thd, TABLE_LIST *tables,
                              TABLE **ndb_binlog_index)
 {
-  const char *save_proc_info= thd->proc_info;
+  const char *save_proc_info=
+    thd_proc_info(thd, "Opening " NDB_REP_DB "." NDB_REP_TABLE);
 
   bzero((char*) tables, sizeof(*tables));
   tables->db= repdb;
   tables->alias= tables->table_name= reptable;
   tables->lock_type= TL_WRITE;
-  thd->proc_info= "Opening " NDB_REP_DB "." NDB_REP_TABLE;
   tables->required_type= FRMTYPE_TABLE;
   if (simple_open_n_lock_tables(thd, tables))
   {
@@ -3420,12 +3420,14 @@ ndb_binlog_index_table__open(THD *thd, T
       sql_print_error("NDB Binlog: Opening ndb_binlog_index: %d, '%s'",
                       thd_stmt_da(thd)->sql_errno(),
                       thd_stmt_da(thd)->message());
-    thd->proc_info= save_proc_info;
+    thd_proc_info(thd, save_proc_info);
     return -1;
   }
   *ndb_binlog_index= tables->table;
-  thd->proc_info= save_proc_info;
   (*ndb_binlog_index)->use_all_columns();
+
+  thd_proc_info(thd, save_proc_info);
+
   return 0;
 }
 

Attachment: [text/bzr-bundle] bzr/[e-mail]