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

[Magnus Blåudd]

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

 3152 Magnus Blåudd	2011-01-26
      ndb
       - init mdl_request properly before opening the mysql.ndb_binlog_index
         table by using the init_one_table function of TABLE_LIST.
       - remove the simple_open_n_lock_tables glue, not needed anymore

    modified:
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_glue.h
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-01-26 10:06:46 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-01-26 12:57:18 +0000
@@ -3404,14 +3404,17 @@ static int open_and_lock_ndb_binlog_inde
 {
   const char *save_proc_info= thd->proc_info;
 
-  bzero((char*) tables, sizeof(*tables));
-  tables->db= repdb;
-  tables->alias= tables->table_name= reptable;
-  tables->lock_type= TL_WRITE;
+  tables->init_one_table(NDB_REP_DB, strlen(NDB_REP_DB),
+                         NDB_REP_TABLE, strlen(NDB_REP_TABLE),
+                         NDB_REP_TABLE, TL_WRITE);
+
   thd->proc_info= "Opening " NDB_REP_DB "." NDB_REP_TABLE;
   tables->required_type= FRMTYPE_TABLE;
   thd->clear_error();
-  if (simple_open_n_lock_tables(thd, tables))
+
+  const bool derived = false;
+  const uint flags = 0;
+  if (open_and_lock_tables(thd, tables, derived, flags))
   {
     if (thd->killed)
       sql_print_error("NDB Binlog: Opening ndb_binlog_index: killed");

=== modified file 'sql/ha_ndbcluster_glue.h'
--- a/sql/ha_ndbcluster_glue.h	2011-01-21 12:43:19 +0000
+++ b/sql/ha_ndbcluster_glue.h	2011-01-26 12:57:18 +0000
@@ -66,12 +66,6 @@ bool close_cached_tables(THD *thd, TABLE
   return close_cached_tables(thd, tables, wait_for_refresh, LONG_TIMEOUT);
 }
 
-/* simple_open_n_lock_tables has been removed */
-inline int simple_open_n_lock_tables(THD *thd, TABLE_LIST *tables)
-{
-  return open_and_lock_tables(thd, tables, FALSE, 0);
-}
-
 /* Online alter table not supported */
 #define NDB_WITHOUT_ONLINE_ALTER
 

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