List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:October 20 2010 2:06pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3882)
View as plain text  
#At file:///home/msvensson/mysql/tmp/3JGCUHEUos/7.0/ based on revid:magnus.blaudd@strippedhn4bejn

 3882 Magnus Blåudd	2010-10-20 [merge]
      Merge 6.3 -> 7.0

    modified:
      sql/log_event.cc
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/set_var.cc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-10-20 11:10:46 +0000
+++ b/sql/log_event.cc	2010-10-20 14:06:09 +0000
@@ -7572,12 +7572,12 @@ int Rows_log_event::do_apply_event(Relay
         thd->options|= OPTION_RELAXED_UNIQUE_CHECKS;
     else
         thd->options&= ~OPTION_RELAXED_UNIQUE_CHECKS;
-    
+#ifndef MCP_WL3733
     if (slave_allow_batching)
       thd->options|= OPTION_ALLOW_BATCH;
     else
       thd->options&= ~OPTION_ALLOW_BATCH;
-    
+#endif
     /* A small test to verify that objects have consistent types */
     DBUG_ASSERT(sizeof(thd->options) == sizeof(OPTION_RELAXED_UNIQUE_CHECKS));
 
@@ -7701,8 +7701,11 @@ int Rows_log_event::do_apply_event(Relay
   */
   if (rli->tables_to_lock && get_flags(STMT_END_F))
     const_cast<Relay_log_info*>(rli)->clear_tables_to_lock();
+
+#ifndef MCP_WL3733
   /* reset OPTION_ALLOW_BATCH as not affect later events */
   thd->options&= ~OPTION_ALLOW_BATCH;
+#endif
   
   if (error)
   {
@@ -9049,6 +9052,7 @@ int Rows_log_event::find_row(const Relay
 
     */
 
+#ifndef MCP_WL3733
     /*
       Ndb does not need read before delete/update (and no updates are sent)
       if primary key specified
@@ -9063,7 +9067,7 @@ int Rows_log_event::find_row(const Relay
       table->file->extra(HA_EXTRA_IGNORE_NO_KEY);
       DBUG_RETURN(0);
     }
-    
+#endif
     DBUG_PRINT("info",("locating record using primary key (position)"));
     int error= table->file->rnd_pos_by_record(table->record[0]);
     if (error)

=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2010-10-12 14:53:28 +0000
+++ b/sql/mysql_priv.h	2010-10-20 14:06:09 +0000
@@ -506,11 +506,13 @@ enum open_table_mode
 #define TMP_TABLE_FORCE_MYISAM          (ULL(1) << 32)
 #define OPTION_PROFILING                (ULL(1) << 33)
 
+#ifndef MCP_WL3733
 /*
   Dont report errors for individual rows,
   But just report error on commit (or read ofcourse)
 */
-#define OPTION_ALLOW_BATCH              (ULL(1) << 33) // THD, intern (slave)
+#define OPTION_ALLOW_BATCH              (ULL(1) << 34) // THD, intern (slave)
+#endif
 
 /**
   Maximum length of time zone name that we support
@@ -1934,7 +1936,9 @@ extern ulong slow_launch_threads, slow_l
 extern ulong table_cache_size, table_def_size;
 extern MYSQL_PLUGIN_IMPORT ulong max_connections;
 extern ulong max_connect_errors, connect_timeout;
+#ifndef MCP_WL3733
 extern my_bool slave_allow_batching;
+#endif
 extern ulong slave_net_timeout, slave_trans_retries;
 extern uint max_user_connections;
 extern ulong what_to_log,flush_time;

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-10-20 11:10:46 +0000
+++ b/sql/mysqld.cc	2010-10-20 14:06:09 +0000
@@ -544,7 +544,9 @@ ulong open_files_limit, max_binlog_size,
 ulong slave_net_timeout, slave_trans_retries;
 ulong slave_exec_mode_options;
 static const char *slave_exec_mode_str= "STRICT";
+#ifndef MCP_WL3733
 my_bool slave_allow_batching;
+#endif
 ulong slave_type_conversions_options;
 const char *slave_type_conversions_default= "";
 ulong thread_cache_size=0, thread_pool_size= 0;
@@ -5729,7 +5731,7 @@ enum options_mysqld
   OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE,
   OPT_RPL_RECOVERY_RANK,OPT_INIT_RPL_ROLE,
   OPT_RELAY_LOG, OPT_RELAY_LOG_INDEX, OPT_RELAY_LOG_INFO_FILE,
-  OPT_SLAVE_SKIP_ERRORS, OPT_SLAVE_ALLOW_BATCHING, OPT_DES_KEY_FILE, OPT_LOCAL_INFILE,
+  OPT_SLAVE_SKIP_ERRORS, OPT_DES_KEY_FILE, OPT_LOCAL_INFILE,
   OPT_SSL_SSL, OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA,
   OPT_SSL_CAPATH, OPT_SSL_CIPHER,
   OPT_BACK_LOG, OPT_BINLOG_CACHE_SIZE,
@@ -7105,10 +7107,12 @@ thread is in the relay logs.",
    "before giving up and stopping.",
    &slave_trans_retries, &slave_trans_retries, 0,
    GET_ULONG, REQUIRED_ARG, 10L, 0L, (longlong) ULONG_MAX, 0, 1, 0},
-  {"slave-allow-batching", OPT_SLAVE_ALLOW_BATCHING,
+#ifndef MCP_WL3733
+  {"slave-allow-batching", 255,
    "Allow slave to batch requests.",
    &slave_allow_batching, &slave_allow_batching,
    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
+#endif
 #endif /* HAVE_REPLICATION */
   {"slow_launch_time", OPT_SLOW_LAUNCH_TIME,
    "If creating the thread takes longer than this value (in seconds), "

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2010-10-20 11:10:46 +0000
+++ b/sql/set_var.cc	2010-10-20 14:06:09 +0000
@@ -608,10 +608,12 @@ static sys_var_set_slave_mode slave_exec
                                               &slave_exec_mode_options,
                                               &slave_exec_mode_typelib,
                                               0);
+#ifndef MCP_WL3733
 #ifdef HAVE_REPLICATION
 static sys_var_bool_ptr         sys_slave_allow_batching(&vars, "slave_allow_batching",
                                                          &slave_allow_batching);
 #endif
+#endif
 static sys_var_set slave_type_conversions(&vars,
                                           "slave_type_conversions",
                                           &slave_type_conversions_options,

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3882) Magnus Blåudd20 Oct