#At file:///media/sda3/work/mysql/bzrwork/test/5.1-rpl/
2684 He Zhenxing 2008-11-05 [merge]
For test, please ignore
removed:
mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt
mysql-test/suite/rpl/t/rpl_bug26395-master.opt
mysql-test/suite/rpl/t/rpl_bug26395-slave.opt
mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt
mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt
mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_idempotency-master.opt
mysql-test/suite/rpl/t/rpl_insert_id-slave.opt
mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt
mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt
mysql-test/suite/rpl/t/rpl_invoked_features-master.opt
mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt
mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt
mysql-test/suite/rpl/t/rpl_read_only-slave.opt
mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt
mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt
mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt
mysql-test/suite/rpl/t/rpl_row_func003-slave.opt
mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt
mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_sp003-master.opt
mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt
mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt
mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt
mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt
mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt
mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt
mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt
modified:
client/mysqltest.cc
mysql-test/extra/rpl_tests/rpl_log.test
mysql-test/r/distinct.result
mysql-test/r/log_basic.result
mysql-test/r/mysql_upgrade.result
mysql-test/r/mysqltest.result
mysql-test/suite/binlog/r/binlog_multi_engine.result
mysql-test/suite/federated/federated.result
mysql-test/suite/federated/federated.test
mysql-test/suite/federated/federated_bug_25714.test
mysql-test/suite/rpl/r/rpl_innodb.result
mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
mysql-test/suite/rpl/r/rpl_row_log.result
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
mysql-test/suite/rpl/r/rpl_sp.result
mysql-test/suite/rpl/r/rpl_stm_log.result
mysql-test/suite/rpl/rpl_1slave_base.cnf
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt
mysql-test/suite/rpl/t/rpl_idempotency-slave.opt
mysql-test/suite/rpl/t/rpl_innodb-master.opt
mysql-test/suite/rpl/t/rpl_innodb.test
mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt
mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt
mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test
mysql-test/t/distinct.test
mysql-test/t/mysqltest.test
per-file messages:
mysql-test/extra/rpl_tests/rpl_log.test
Using RESET MASTER in the middle of a sequence of statements cause
a race condition between the dump thread sending the preceeding
statements to the slave and the RESET MASTER.
mysql-test/suite/federated/federated.test
Fixing include paths.
mysql-test/suite/federated/federated_bug_25714.test
Removing extreneous lines added by merge.
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
Correcting typo (the spaces following the connection name was included as part of the name).
mysql-test/t/distinct.test
Correcting paths.
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc 2008-09-11 16:40:15 +0000
+++ b/client/mysqltest.cc 2008-10-23 14:23:13 +0000
@@ -2036,17 +2036,6 @@ void var_set_errno(int sql_errno)
/*
- Update $mysql_get_server_version variable with version
- of the currently connected server
-*/
-
-void var_set_mysql_get_server_version(MYSQL* mysql)
-{
- var_set_int("$mysql_get_server_version", mysql_get_server_version(mysql));
-}
-
-
-/*
Set variable from the result of a query
SYNOPSIS
@@ -4461,36 +4450,51 @@ void set_reconnect(MYSQL* mysql, int val
}
-int select_connection_name(const char *name)
+/**
+ Change the current connection to the given st_connection, and update
+ $mysql_get_server_version and $CURRENT_CONNECTION accordingly.
+*/
+void set_current_connection(struct st_connection *con)
+{
+ cur_con= con;
+ /* Update $mysql_get_server_version to that of current connection */
+ var_set_int("$mysql_get_server_version",
+ mysql_get_server_version(&con->mysql));
+ /* Update $CURRENT_CONNECTION to the name of the current connection */
+ var_set_string("$CURRENT_CONNECTION", con->name);
+}
+
+
+void select_connection_name(const char *name)
{
DBUG_ENTER("select_connection_name");
DBUG_PRINT("enter",("name: '%s'", name));
+ st_connection *con= find_connection_by_name(name);
- if (!(cur_con= find_connection_by_name(name)))
+ if (!con)
die("connection '%s' not found in connection pool", name);
- /* Update $mysql_get_server_version to that of current connection */
- var_set_mysql_get_server_version(&cur_con->mysql);
+ set_current_connection(con);
- DBUG_RETURN(0);
+ DBUG_VOID_RETURN;
}
-int select_connection(struct st_command *command)
+void select_connection(struct st_command *command)
{
- char *name;
- char *p= command->first_argument;
DBUG_ENTER("select_connection");
+ static DYNAMIC_STRING ds_connection;
+ const struct command_arg connection_args[] = {
+ { "connection_name", ARG_STRING, TRUE, &ds_connection, "Name of the connection that we switch to." }
+ };
+ check_command_args(command, command->first_argument, connection_args,
+ sizeof(connection_args)/sizeof(struct command_arg),
+ ',');
- if (!*p)
- die("Missing connection name in connect");
- name= p;
- while (*p && !my_isspace(charset_info,*p))
- p++;
- if (*p)
- *p++= 0;
- command->last_argument= p;
- DBUG_RETURN(select_connection_name(name));
+ DBUG_PRINT("info", ("changing connection: %s", ds_connection.str));
+ select_connection_name(ds_connection.str);
+ dynstr_free(&ds_connection);
+ DBUG_VOID_RETURN;
}
@@ -4898,15 +4902,12 @@ void do_connect(struct st_command *comma
if (!(con_slot->name= my_strdup(ds_connection_name.str, MYF(MY_WME))))
die("Out of memory");
con_slot->name_len= strlen(con_slot->name);
- cur_con= con_slot;
-
+ set_current_connection(con_slot);
+
if (con_slot == next_con)
next_con++; /* if we used the next_con slot, advance the pointer */
}
- /* Update $mysql_get_server_version to that of current connection */
- var_set_mysql_get_server_version(&cur_con->mysql);
-
dynstr_free(&ds_connection_name);
dynstr_free(&ds_host);
dynstr_free(&ds_user);
@@ -7478,37 +7479,37 @@ int main(int argc, char **argv)
if (cursor_protocol_enabled)
ps_protocol_enabled= 1;
- cur_con= connections;
- if (!( mysql_init(&cur_con->mysql)))
+ st_connection *con= connections;
+ if (!( mysql_init(&con->mysql)))
die("Failed in mysql_init()");
if (opt_compress)
- mysql_options(&cur_con->mysql,MYSQL_OPT_COMPRESS,NullS);
- mysql_options(&cur_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);
- mysql_options(&cur_con->mysql, MYSQL_SET_CHARSET_NAME,
+ mysql_options(&con->mysql,MYSQL_OPT_COMPRESS,NullS);
+ mysql_options(&con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);
+ mysql_options(&con->mysql, MYSQL_SET_CHARSET_NAME,
charset_info->csname);
if (opt_charsets_dir)
- mysql_options(&cur_con->mysql, MYSQL_SET_CHARSET_DIR,
+ mysql_options(&con->mysql, MYSQL_SET_CHARSET_DIR,
opt_charsets_dir);
#ifdef HAVE_OPENSSL
if (opt_use_ssl)
{
- mysql_ssl_set(&cur_con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
+ mysql_ssl_set(&con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
opt_ssl_capath, opt_ssl_cipher);
#if MYSQL_VERSION_ID >= 50000
/* Turn on ssl_verify_server_cert only if host is "localhost" */
opt_ssl_verify_server_cert= opt_host && !strcmp(opt_host, "localhost");
- mysql_options(&cur_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+ mysql_options(&con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
&opt_ssl_verify_server_cert);
#endif
}
#endif
- if (!(cur_con->name = my_strdup("default", MYF(MY_WME))))
+ if (!(con->name = my_strdup("default", MYF(MY_WME))))
die("Out of memory");
- safe_connect(&cur_con->mysql, cur_con->name, opt_host, opt_user, opt_pass,
+ safe_connect(&con->mysql, con->name, opt_host, opt_user, opt_pass,
opt_db, opt_port, unix_sock);
/* Use all time until exit if no explicit 'start_timer' */
@@ -7521,8 +7522,7 @@ int main(int argc, char **argv)
*/
var_set_errno(-1);
- /* Update $mysql_get_server_version to that of current connection */
- var_set_mysql_get_server_version(&cur_con->mysql);
+ set_current_connection(con);
if (opt_include)
{
=== modified file 'mysql-test/extra/rpl_tests/rpl_log.test'
--- a/mysql-test/extra/rpl_tests/rpl_log.test 2008-10-07 08:25:12 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_log.test 2008-10-29 17:38:18 +0000
@@ -126,9 +126,13 @@ DROP TABLE t3;
# Bug #6880: LAST_INSERT_ID() within a statement
#
+# Reset binlog so that show binlog events will not show the tests
+# above.
+source include/master-slave-reset.inc;
+connection master;
+
create table t1(a int auto_increment primary key, b int);
insert into t1 values (NULL, 1);
-reset master;
set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
source include/show_binlog_events.inc;
@@ -138,4 +142,3 @@ drop table t1;
# End of 4.1 tests
sync_slave_with_master;
-drop table t1;
=== modified file 'mysql-test/r/distinct.result'
--- a/mysql-test/r/distinct.result 2008-09-30 19:32:35 +0000
+++ b/mysql-test/r/distinct.result 2008-10-29 17:38:18 +0000
@@ -653,11 +653,11 @@ DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20)
default NULL);
SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE
-'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
-LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
+'../../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
+LOAD DATA INFILE '../../tmp/data1.tmp' INTO TABLE t2;
SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE
-'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
-LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;
+'../../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
+LOAD DATA INFILE '../../tmp/data2.tmp' INTO TABLE t2;
SELECT @v19, @v20;
@v19 @v20
2 APPLE
=== modified file 'mysql-test/r/log_basic.result'
--- a/mysql-test/r/log_basic.result 2008-10-23 19:27:09 +0000
+++ b/mysql-test/r/log_basic.result 2008-10-29 17:38:18 +0000
@@ -17,3 +17,5 @@ WHERE VARIABLE_NAME='log';
VARIABLE_VALUE
OFF
SET @@global.log= @start_log;
+Warnings:
+Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
=== modified file 'mysql-test/r/mysql_upgrade.result'
--- a/mysql-test/r/mysql_upgrade.result 2008-10-13 18:33:08 +0000
+++ b/mysql-test/r/mysql_upgrade.result 2008-10-30 13:52:04 +0000
@@ -97,7 +97,7 @@ mysql.time_zone_transition_type
mysql.user OK
DROP USER mysqltest1@'%';
Run mysql_upgrade with a non existing server socket
-mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
+mysqlcheck: Got error: 2003: Can't connect to MySQL server on 'not_existing_host' (errno) when trying to connect
FATAL ERROR: Upgrade failed
set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
mtr.global_suppressions OK
=== modified file 'mysql-test/r/mysqltest.result'
--- a/mysql-test/r/mysqltest.result 2008-08-08 18:10:43 +0000
+++ b/mysql-test/r/mysqltest.result 2008-10-23 14:23:13 +0000
@@ -740,4 +740,9 @@ select 1;
1
-- a comment for the server;
mysqltest: At line 1: Found line beginning with -- that didn't contain a valid mysqltest command, check your syntax or use # if you intended to write a comment
+con1
+default
+con1
+default
+con1
End of tests
=== modified file 'mysql-test/suite/binlog/r/binlog_multi_engine.result'
--- a/mysql-test/suite/binlog/r/binlog_multi_engine.result 2008-10-23 19:27:09 +0000
+++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result 2008-10-24 12:51:06 +0000
@@ -73,19 +73,19 @@ UPDATE t1n, t1b SET e = 2, b = 3 WHERE f
ERROR HY000: Binary logging not possible. Message: Statement cannot be written atomically since more than one engine involved and at least one engine is self-logging
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Query # # use `test`; BEGIN
-master-bin.000001 # Table_map # # table_id: # (test.t1m)
-master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
-master-bin.000001 # Query # # use `test`; COMMIT
-master-bin.000001 # Query # # use `test`; BEGIN
-master-bin.000001 # Table_map # # table_id: # (test.t1b)
-master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
-master-bin.000001 # Query # # use `test`; COMMIT
-master-bin.000001 # Query # # BEGIN
-master-bin.000001 # Table_map # # table_id: # (test.t1n)
-master-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status)
-master-bin.000001 # Write_rows # # table_id: #
-master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
-master-bin.000001 # Query # # COMMIT
+mysqld-bin.000001 # Query # # use `test`; BEGIN
+mysqld-bin.000001 # Table_map # # table_id: # (test.t1m)
+mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
+mysqld-bin.000001 # Query # # use `test`; COMMIT
+mysqld-bin.000001 # Query # # use `test`; BEGIN
+mysqld-bin.000001 # Table_map # # table_id: # (test.t1b)
+mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
+mysqld-bin.000001 # Query # # use `test`; COMMIT
+mysqld-bin.000001 # Query # # BEGIN
+mysqld-bin.000001 # Table_map # # table_id: # (test.t1n)
+mysqld-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status)
+mysqld-bin.000001 # Write_rows # # table_id: #
+mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
+mysqld-bin.000001 # Query # # COMMIT
RESET MASTER;
DROP TABLE t1m, t1b, t1n;
=== modified file 'mysql-test/suite/federated/federated.result'
--- a/mysql-test/suite/federated/federated.result 2008-10-23 19:27:09 +0000
+++ b/mysql-test/suite/federated/federated.result 2008-10-29 17:38:18 +0000
@@ -2133,4 +2133,3 @@ DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;
-SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;
=== modified file 'mysql-test/suite/federated/federated.test'
--- a/mysql-test/suite/federated/federated.test 2008-10-23 19:27:09 +0000
+++ b/mysql-test/suite/federated/federated.test 2008-10-29 17:38:18 +0000
@@ -6,7 +6,7 @@
# should work with embedded server after mysqltest is fixed
--source include/not_embedded.inc
---source include/federated.inc
+--source federated.inc
connection default;
@@ -1936,4 +1936,4 @@ connection slave;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
connection default;
-source include/federated_cleanup.inc;
+source federated_cleanup.inc;
=== modified file 'mysql-test/suite/federated/federated_bug_25714.test'
--- a/mysql-test/suite/federated/federated_bug_25714.test 2008-10-23 19:27:09 +0000
+++ b/mysql-test/suite/federated/federated_bug_25714.test 2008-10-29 17:38:18 +0000
@@ -60,6 +60,3 @@ SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLA
source federated_cleanup.inc;
-
-connection default;
-SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;
=== modified file 'mysql-test/suite/rpl/r/rpl_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb.result 2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb.result 2008-10-29 13:25:03 +0000
@@ -43,6 +43,7 @@ CREATE TEMPORARY TABLE mysqltest1.tmp (f
CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="InnoDB";
SET AUTOCOMMIT = 0;
-------- switch to slave --------
+ALTER TABLE mysqltest1.t1 ENGINE = MyISAM;
SHOW CREATE TABLE mysqltest1.t1;
Table Create Table
t1 CREATE TABLE `t1` (
=== modified file 'mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result 2007-06-29 17:09:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result 2008-10-29 13:25:03 +0000
@@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` (
`b` char(254) DEFAULT NULL,
PRIMARY KEY (`a`),
KEY `index1` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
@@ -85,7 +85,7 @@ t2 CREATE TABLE `t2` (
`b` char(254) DEFAULT NULL,
PRIMARY KEY (`a`),
KEY `index1` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
******************** DDL for indexes ********************
ALTER TABLE t2 ADD COLUMN d datetime;
@@ -120,7 +120,7 @@ t1 CREATE TABLE `t1` (
`b` char(254) DEFAULT NULL,
PRIMARY KEY (`a`),
KEY `index1` (`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
@@ -131,7 +131,7 @@ t2 CREATE TABLE `t2` (
KEY `index1` (`b`),
KEY `index2` (`d`),
KEY `index3` (`a`,`d`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
ALTER TABLE t2 DROP COLUMN d;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_log.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log.result 2008-10-07 08:25:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result 2008-10-29 17:38:18 +0000
@@ -288,13 +288,23 @@ ERROR HY000: Error when executing comman
DROP TABLE t1;
DROP TABLE t2;
DROP TABLE t3;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
create table t1(a int auto_increment primary key, b int);
insert into t1 values (NULL, 1);
-reset master;
set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int)
+master-bin.000001 # Query # # use `test`; BEGIN
+master-bin.000001 # Table_map # # table_id: # (test.t1)
+master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
+master-bin.000001 # Query # # use `test`; COMMIT
master-bin.000001 # Query # # use `test`; BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
@@ -305,4 +315,3 @@ a b
5 1
6 1
drop table t1;
-drop table t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_log_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result 2008-10-07 08:25:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result 2008-10-29 17:38:18 +0000
@@ -288,13 +288,23 @@ ERROR HY000: Error when executing comman
DROP TABLE t1;
DROP TABLE t2;
DROP TABLE t3;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
create table t1(a int auto_increment primary key, b int);
insert into t1 values (NULL, 1);
-reset master;
set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int)
+master-bin.000001 # Query # # use `test`; BEGIN
+master-bin.000001 # Table_map # # table_id: # (test.t1)
+master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
+master-bin.000001 # Query # # use `test`; COMMIT
master-bin.000001 # Query # # use `test`; BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
@@ -305,4 +315,3 @@ a b
5 1
6 1
drop table t1;
-drop table t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_sp.result'
--- a/mysql-test/suite/rpl/r/rpl_sp.result 2008-10-23 19:27:09 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sp.result 2008-10-24 12:51:06 +0000
@@ -555,11 +555,11 @@ end
master-bin.000001 # Query 1 # use `mysqltest`; SELECT `mysqltest2`.`f1`()
set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators;
Warnings:
-Warning 1287 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead
+Warning 1287 The syntax '@@log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use '@@log_bin_trust_function_creators' instead
set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators;
Warnings:
-Warning 1287 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead
+Warning 1287 The syntax '@@log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use '@@log_bin_trust_function_creators' instead
set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
drop database mysqltest;
drop database mysqltest2;
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_log.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result 2008-10-07 08:25:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result 2008-10-29 17:38:18 +0000
@@ -270,13 +270,21 @@ ERROR HY000: Error when executing comman
DROP TABLE t1;
DROP TABLE t2;
DROP TABLE t3;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
create table t1(a int auto_increment primary key, b int);
insert into t1 values (NULL, 1);
-reset master;
set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int)
+master-bin.000001 # Intvar # # INSERT_ID=1
+master-bin.000001 # Query # # use `test`; insert into t1 values (NULL, 1)
master-bin.000001 # Intvar # # LAST_INSERT_ID=1
master-bin.000001 # Intvar # # INSERT_ID=5
master-bin.000001 # Query # # use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
@@ -286,4 +294,3 @@ a b
5 1
6 1
drop table t1;
-drop table t1;
=== modified file 'mysql-test/suite/rpl/rpl_1slave_base.cnf'
--- a/mysql-test/suite/rpl/rpl_1slave_base.cnf 2007-12-19 10:08:41 +0000
+++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf 2008-10-29 13:25:03 +0000
@@ -8,6 +8,8 @@
log-bin= master-bin
+loose-innodb
+
[mysqld.2]
# Run the slave.sh script before starting this process
#!run-slave-sh
@@ -39,7 +41,7 @@ slave-load-tmpdir= ../../tmp
rpl-recovery-rank= @mysqld.2.server-id
-loose-skip-innodb
+loose-innodb
[ENV]
=== removed file 'mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_bug26395-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_bug26395-master.opt 2008-07-06 10:53:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug26395-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_bug26395-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt 2008-07-06 10:53:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== modified file 'mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test'
--- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test 2008-07-25 17:23:50 +0000
+++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test 2008-10-29 17:38:18 +0000
@@ -127,7 +127,7 @@ INSERT INTO t1(b,c) VALUES('A',3);
INSERT INTO t1(b,c) VALUES('B',3);
--connection master_d
INSERT INTO t1(b,c) VALUES('D',3);
---connection master_a
+connection master_a;
--sync_slave_with_master master_b
--sync_slave_with_master master_d
=== modified file 'mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt 2008-10-29 13:25:03 +0000
@@ -1 +1 @@
---innodb --innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096
+--innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096
=== removed file 'mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt 2008-02-27 17:46:06 +0000
+++ b/mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt 2007-07-29 22:10:42 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt 2007-07-29 22:10:42 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
- --innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_idempotency-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_idempotency-master.opt 2007-12-12 10:14:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_idempotency-master.opt 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
---innodb
-
=== modified file 'mysql-test/suite/rpl/t/rpl_idempotency-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_idempotency-slave.opt 2007-12-12 10:14:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_idempotency-slave.opt 2008-10-29 13:25:03 +0000
@@ -1,2 +1 @@
---slave-exec-mode=IDEMPOTENT --innodb
-
+--slave-exec-mode=IDEMPOTENT
=== modified file 'mysql-test/suite/rpl/t/rpl_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_innodb-master.opt 2007-09-08 18:19:35 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb-master.opt 2008-10-29 13:25:03 +0000
@@ -1 +1 @@
---innodb --innodb_autoinc_lock_mode=0
+--innodb_autoinc_lock_mode=0
=== modified file 'mysql-test/suite/rpl/t/rpl_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_innodb.test 2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb.test 2008-10-29 13:25:03 +0000
@@ -74,6 +74,17 @@ SET AUTOCOMMIT = 0;
sync_slave_with_master;
--echo -------- switch to slave --------
connection slave;
+
+# We want to verify that the following transactions are written to the
+# binlog, despite the transaction is rolled back. (The should be
+# written to the binlog since they contain non-transactional DROP
+# TEMPORARY TABLE). To see that, we use the auxiliary table t1, which
+# is transactional (InnoDB) on master and MyISAM on slave. t1 should
+# be transactional on master so that the insert into t1 does not cause
+# the transaction to be logged. Since t1 is non-transactional on
+# slave, the change will not be rolled back, so the inserted rows will
+# stay in t1 and we can verify that the transaction was replicated.
+ALTER TABLE mysqltest1.t1 ENGINE = MyISAM;
SHOW CREATE TABLE mysqltest1.t1;
--echo -------- switch to master --------
@@ -100,8 +111,7 @@ connection slave;
SHOW CREATE TABLE mysqltest1.tmp;
--error ER_NO_SUCH_TABLE
SHOW CREATE TABLE mysqltest1.tmp2;
-# has two rows here : as the default is MyISAM and
-# it can't be rolled back by the master's ROLLBACK.
+# t1 has two rows here: the transaction not rolled back since t1 uses MyISAM
SELECT COUNT(*) FROM mysqltest1.t1;
FLUSH LOGS;
=== modified file 'mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt 2007-09-08 18:19:35 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt 2008-10-29 13:25:03 +0000
@@ -1 +1 @@
---innodb --innodb_autoinc_lock_mode=0
+--innodb_autoinc_lock_mode=0
=== modified file 'mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt 2007-09-08 18:56:55 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt 2008-10-29 13:25:03 +0000
@@ -1 +1 @@
---innodb --innodb_autoinc_lock_mode=0
+--innodb_autoinc_lock_mode=0
=== removed file 'mysql-test/suite/rpl/t/rpl_insert_id-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_insert_id-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_insert_id-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_invoked_features-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt 2007-06-27 14:49:32 +0000
+++ b/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt 2007-06-27 14:49:32 +0000
+++ b/mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_read_only-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_read_only-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_read_only-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== modified file 'mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt 2008-10-29 13:25:03 +0000
@@ -1,3 +1,2 @@
-O max_relay_log_size=16384
---loose-innodb
--log-warnings
=== modified file 'mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt 2008-10-29 13:25:03 +0000
@@ -1,2 +1,2 @@
---binlog_ignore_db=test_ignore --loose-innodb
+--binlog_ignore_db=test_ignore
=== removed file 'mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_func003-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_func003-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_func003-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp003-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp003-master.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp003-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt 2008-04-20 12:32:08 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt 2008-04-20 12:32:08 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt 2007-10-19 12:18:41 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---innodb
=== removed file 'mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-innodb
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result 2008-10-06 08:27:36 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result 2008-10-29 17:38:18 +0000
@@ -117,7 +117,6 @@ Aberdeen
Abernathy
aberrant
aberration
-include/start_slave.inc
select * from t1 order by 1 asc;
word
Aarhus
@@ -305,13 +304,23 @@ ERROR HY000: Error when executing comman
DROP TABLE t1;
DROP TABLE t2;
DROP TABLE t3;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
create table t1(a int auto_increment primary key, b int);
insert into t1 values (NULL, 1);
-reset master;
set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int)
+master-bin.000001 # Query # # use `test`; BEGIN
+master-bin.000001 # Table_map # # table_id: # (test.t1)
+master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
+master-bin.000001 # Query # # use `test`; COMMIT
master-bin.000001 # Query # # use `test`; BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf 2008-04-25 16:54:42 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf 2008-10-31 14:11:44 +0000
@@ -3,17 +3,14 @@
[mysqld.1.1]
server-id= 1
log-bin
-log-slave-updates
[mysqld.2.1]
server-id= 1
log-bin
-log-slave-updates
[mysqld.1.slave]
server-id= 2
log-bin
-log-slave-updates
skip-slave-start
[mysqld.2.slave]
@@ -25,7 +22,6 @@ master-user= @mysqld.2.1.#user
master-connect-retry= 1
init-rpl-role= slave
log-bin
-log-slave-updates
skip-slave-start
ndb_connectstring= @mysql_cluster.slave.ndb_connectstring
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test 2008-08-15 02:31:04 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test 2008-10-31 14:11:44 +0000
@@ -6,6 +6,7 @@
#############################################################
--source include/have_ndb.inc
--source include/ndb_master-slave_2ch.inc
+--source include/have_binlog_format_mixed_or_row.inc
--echo
# Check server_id and set auto_increment_* variables
=== modified file 'mysql-test/t/distinct.test'
--- a/mysql-test/t/distinct.test 2008-10-23 19:27:09 +0000
+++ b/mysql-test/t/distinct.test 2008-10-29 17:38:18 +0000
@@ -487,14 +487,14 @@ CREATE TABLE t2 (fruit_id INT NOT NULL,
default NULL);
SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE
-'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
-LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
+'../../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
+LOAD DATA INFILE '../../tmp/data1.tmp' INTO TABLE t2;
--error 0,1
--remove_file $MYSQLTEST_VARDIR/tmp/data1.tmp
SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE
-'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
-LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;
+'../../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
+LOAD DATA INFILE '../../tmp/data2.tmp' INTO TABLE t2;
--remove_file $MYSQLTEST_VARDIR/tmp/data2.tmp
SELECT @v19, @v20;
=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test 2008-08-08 18:10:43 +0000
+++ b/mysql-test/t/mysqltest.test 2008-10-23 14:23:13 +0000
@@ -2183,5 +2183,29 @@ select 1;
--exec echo "--select 1;" | $MYSQL_TEST 2>&1
+# ----------------------------------------------------------------------------
+# BUG#35701: please allow test language variables in connection and sync_slave_with_master
+# Test that "connection $variable" works and that $CURRENT_CONNECTION has the right value.
+# ----------------------------------------------------------------------------
+
+connect (con1,localhost,root,,);
+--echo $CURRENT_CONNECTION
+
+connection default;
+--echo $CURRENT_CONNECTION
+
+connection con1;
+--echo $CURRENT_CONNECTION
+
+let $x= default;
+let $y= con1;
+
+connection $x;
+--echo $CURRENT_CONNECTION
+
+connection $y;
+--echo $CURRENT_CONNECTION
+
+
--echo End of tests
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (zhenxing.he:2684) Bug#35701 Bug#39007Bug#40257 | He Zhenxing | 6 Nov |
