Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-05-07 21:55:52+02:00, tomas@stripped +5 -0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-6.1-batch-slave
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-batch-slave
MERGE: 1.2403.15.92
mysql-test/mysql-test-run.pl@stripped, 2007-05-07 21:53:00+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.261.2.3
sql/log_event.cc@stripped, 2007-05-07 21:55:50+02:00, tomas@stripped +0 -1
manual merge
MERGE: 1.263.3.3
sql/mysql_priv.h@stripped, 2007-05-07 21:53:00+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.470.17.2
sql/mysqld.cc@stripped, 2007-05-07 21:55:50+02:00, tomas@stripped +1 -2
manual merge
MERGE: 1.601.20.4
sql/set_var.cc@stripped, 2007-05-07 21:53:00+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.211.4.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tomas
# Host: whalegate.ndb.mysql.com
# Root: /home/tomas/mysql-5.1-telco-batch-slave/RESYNC
--- 1.277/sql/log_event.cc 2007-05-02 22:37:16 +02:00
+++ 1.278/sql/log_event.cc 2007-05-07 21:55:50 +02:00
@@ -35,7 +35,6 @@
#define log_cs &my_charset_latin1
#define FLAGSTR(V,F) ((V)&(F)?#F" ":"")
-extern my_bool opt_slave_allow_batching;
/*
Cache that will automatically be written to a dedicated file on
@@ -6013,8 +6012,10 @@
else
thd->options&= ~OPTION_RELAXED_UNIQUE_CHECKS;
- if (opt_slave_allow_batching)
- thd->options |= OPTION_ALLOW_BATCH;
+ if (slave_allow_batching)
+ thd->options|= OPTION_ALLOW_BATCH;
+ else
+ thd->options&= ~OPTION_ALLOW_BATCH;
/* A small test to verify that objects have consistent types */
DBUG_ASSERT(sizeof(thd->options) == sizeof(OPTION_RELAXED_UNIQUE_CHECKS));
--- 1.504/sql/mysql_priv.h 2007-05-02 22:37:16 +02:00
+++ 1.505/sql/mysql_priv.h 2007-05-07 21:53:00 +02:00
@@ -1642,6 +1642,7 @@
extern ulong slow_launch_threads, slow_launch_time;
extern ulong table_cache_size, table_def_size;
extern ulong max_connections,max_connect_errors, connect_timeout;
+extern my_bool slave_allow_batching;
extern ulong slave_net_timeout, slave_trans_retries;
extern uint max_user_connections;
extern ulong what_to_log,flush_time;
--- 1.640/sql/mysqld.cc 2007-05-02 22:37:16 +02:00
+++ 1.641/sql/mysqld.cc 2007-05-07 21:55:50 +02:00
@@ -368,7 +368,6 @@
my_bool opt_log_slave_updates= 0;
my_bool opt_innodb;
bool slave_warning_issued = false;
-my_bool opt_slave_allow_batching= 0;
/*
Legacy global handlerton. These will be removed (please do not add more).
@@ -479,6 +478,7 @@
ulong query_buff_size, slow_launch_time, slave_open_temp_tables;
ulong open_files_limit, max_binlog_size, max_relay_log_size;
ulong slave_net_timeout, slave_trans_retries;
+my_bool slave_allow_batching;
ulong thread_cache_size=0, thread_pool_size= 0;
ulong binlog_cache_size=0, max_binlog_cache_size=0;
ulong query_cache_size=0;
@@ -6421,10 +6421,9 @@
"before giving up and stopping.",
(gptr*) &slave_trans_retries, (gptr*) &slave_trans_retries, 0,
GET_ULONG, REQUIRED_ARG, 10L, 0L, (longlong) ULONG_MAX, 0, 1, 0},
- {"slave_allow_batching", OPT_SLAVE_ALLOW_BATCHING,
+ {"slave-allow-batching", OPT_SLAVE_ALLOW_BATCHING,
"Allow slave to batch requests.",
- (gptr*) &opt_slave_allow_batching,
- (gptr*) &opt_slave_allow_batching,
+ (gptr*) &slave_allow_batching, (gptr*) &slave_allow_batching,
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
#endif /* HAVE_REPLICATION */
{"slow_launch_time", OPT_SLOW_LAUNCH_TIME,
--- 1.284/mysql-test/mysql-test-run.pl 2007-05-07 11:41:38 +02:00
+++ 1.285/mysql-test/mysql-test-run.pl 2007-05-07 21:53:00 +02:00
@@ -3811,7 +3811,7 @@
$cluster->{'connect_string'});
mtr_add_arg($args, "%s--ndb-wait-connected=20", $prefix);
mtr_add_arg($args, "%s--ndb-cluster-connection-pool=3", $prefix);
- mtr_add_arg($args, "%s--slave_allow_batching", $prefix);
+ mtr_add_arg($args, "%s--slave-allow-batching", $prefix);
if ( $mysql_version_id >= 50100 )
{
mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
@@ -3888,7 +3888,7 @@
$clusters->[$mysqld->{'cluster'}]->{'connect_string'});
mtr_add_arg($args, "%s--ndb-wait-connected=20", $prefix);
mtr_add_arg($args, "%s--ndb-cluster-connection-pool=3", $prefix);
- mtr_add_arg($args, "%s--slave_allow_batching", $prefix);
+ mtr_add_arg($args, "%s--slave-allow-batching", $prefix);
if ( $mysql_version_id >= 50100 )
{
mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
--- 1.229/sql/set_var.cc 2007-04-20 10:50:46 +02:00
+++ 1.230/sql/set_var.cc 2007-05-07 21:53:00 +02:00
@@ -425,6 +425,8 @@
sys_var_bool_ptr sys_slave_compressed_protocol("slave_compressed_protocol",
&opt_slave_compressed_protocol);
#ifdef HAVE_REPLICATION
+sys_var_bool_ptr sys_slave_allow_batching("slave_allow_batching",
+ &slave_allow_batching);
sys_var_long_ptr sys_slave_net_timeout("slave_net_timeout",
&slave_net_timeout);
sys_var_long_ptr sys_slave_trans_retries("slave_transaction_retries",
@@ -991,6 +993,7 @@
{"skip_networking", (char*) &opt_disable_networking, SHOW_BOOL},
{"skip_show_database", (char*) &opt_skip_show_db, SHOW_BOOL},
#ifdef HAVE_REPLICATION
+ {sys_slave_allow_batching.name,(char*) &sys_slave_allow_batching, SHOW_SYS},
{sys_slave_compressed_protocol.name,
(char*) &sys_slave_compressed_protocol, SHOW_SYS},
{"slave_load_tmpdir", (char*) &slave_load_tmpdir, SHOW_CHAR_PTR},
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2508) | tomas | 7 May |
