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

[Magnus Blåudd]

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

 3153 Magnus Blåudd	2011-01-27
      ndb
       - rename open_and_lock_ndb_binlog_index () to ndb_binlog_index_table__open()
       - update comment to describe that the table is being opened for write

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-01-27 12:08:05 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-01-27 12:11:16 +0000
@@ -3396,11 +3396,13 @@ struct ndb_binlog_index_row {
   struct ndb_binlog_index_row *next;
 };
 
+
 /*
-  Open the ndb_binlog_index table
+  Open the ndb_binlog_index table for writing
 */
-static int open_and_lock_ndb_binlog_index(THD *thd, TABLE_LIST *tables,
-                                          TABLE **ndb_binlog_index)
+static int
+ndb_binlog_index_table__open(THD *thd, TABLE_LIST *tables,
+                             TABLE **ndb_binlog_index)
 {
   const char *save_proc_info= thd->proc_info;
 
@@ -3447,7 +3449,7 @@ ndb_binlog_index_table__write_rows(THD *
   */
   tmp_disable_binlog(thd);
 
-  if (open_and_lock_ndb_binlog_index(thd, &binlog_tables, &ndb_binlog_index))
+  if (ndb_binlog_index_table__open(thd, &binlog_tables, &ndb_binlog_index))
   {
     sql_print_error("NDB Binlog: Unable to lock table ndb_binlog_index");
     error= -1;

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