List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:February 4 2011 8:01am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4169)
View as plain text  
#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4169 Magnus Blåudd	2011-02-04
      ndb
       - remove NDB_NO_LOG_EMPTY_EPOCH define also from 7.0 now when
         it's available "everywhere"

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_glue.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-01-28 13:02:10 +0000
+++ b/sql/ha_ndbcluster.cc	2011-02-04 08:01:56 +0000
@@ -14965,23 +14965,15 @@ static MYSQL_SYSVAR_BOOL(
   1                                  /* default */
 );
 
-#ifndef NDB_NO_LOG_EMPTY_EPOCHS
-#define LOG_EMPTY_EPOCHS_OPTS PLUGIN_VAR_OPCMDARG
-#define LOG_EMPTY_EPOCHS_DEFAULT 0
-#else
-#define LOG_EMPTY_EPOCHS_OPTS PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY
-#define LOG_EMPTY_EPOCHS_DEFAULT 1
-#endif
-
 static my_bool opt_ndb_log_empty_epochs;
 static MYSQL_SYSVAR_BOOL(
   log_empty_epochs,                  /* name */
   opt_ndb_log_empty_epochs,          /* var */
-  LOG_EMPTY_EPOCHS_OPTS,
+  PLUGIN_VAR_OPCMDARG,
   "",
   NULL,                              /* check func. */
   NULL,                              /* update func. */
-  LOG_EMPTY_EPOCHS_DEFAULT           /* default */
+  0                                  /* default */
 );
 
 bool ndb_log_empty_epochs(void)

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-01-28 08:13:59 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-02-04 08:01:56 +0000
@@ -6699,7 +6699,6 @@ restart_cluster_failure:
                 (! (opt_ndb_log_apply_status &&
                     trans_slave_row_count) ))
             {
-#ifndef NDB_NO_LOG_EMPTY_EPOCHS
               /* nothing to commit, rollback instead */
               if (int r= trans.rollback())
               {
@@ -6709,10 +6708,6 @@ restart_cluster_failure:
                 /* TODO: Further handling? */
               }
               break;
-#else
-              abort(); // Should not come here, log-empty-epochs is always on
-#endif
-            }
           }
       commit_to_binlog:
           thd->proc_info= "Committing events to binlog";

=== modified file 'sql/ha_ndbcluster_glue.h'
--- a/sql/ha_ndbcluster_glue.h	2011-01-14 15:12:39 +0000
+++ b/sql/ha_ndbcluster_glue.h	2011-02-04 08:01:56 +0000
@@ -100,9 +100,6 @@ enum column_format_type {
 /* Global schema lock not available */
 #define NDB_NO_GLOBAL_SCHEMA_LOCK
 
-/* Missing functionality in injector -> no --ndb-log-empty-epochs */
-#define NDB_NO_LOG_EMPTY_EPOCHS
-
 /* No support for --ndb-wait_setup */
 #define NDB_NO_WAIT_SETUP
 

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110204080156-se4t4rglababki1e.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4169) Magnus Blåudd4 Feb