Below is the list of changes that have just been committed into a local
5.1 repository of hezx. When hezx 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, 2008-01-31 16:51:55+08:00, hezx@stripped +7 -0
Post merge fix
mysql-test/include/show_binlog_events2.inc@stripped, 2008-01-31 16:51:52+08:00, hezx@stripped +1 -1
Post merge fix
mysql-test/suite/rpl/r/rpl_loaddata_map.result@stripped, 2008-01-31 16:51:52+08:00, hezx@stripped +8 -8
Post merge fix
mysql-test/suite/rpl/r/rpl_loaddata_map.result@stripped, 2008-01-31 16:51:03+08:00, hezx@stripped +0 -0
Rename: mysql-test/r/rpl_loaddata_map.result -> mysql-test/suite/rpl/r/rpl_loaddata_map.result
mysql-test/suite/rpl/r/rpl_user.result@stripped, 2008-01-31 16:51:52+08:00, hezx@stripped +10 -8
Post merge fix
mysql-test/suite/rpl/r/rpl_user.result@stripped, 2008-01-31 16:51:03+08:00, hezx@stripped +0 -0
Rename: mysql-test/r/rpl_user.result -> mysql-test/suite/rpl/r/rpl_user.result
mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt@stripped, 2008-01-31 16:51:03+08:00, hezx@stripped +0 -0
Rename: mysql-test/t/rpl_loaddata_map-master.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt
mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt@stripped, 2008-01-31 16:51:03+08:00, hezx@stripped +0 -0
Rename: mysql-test/t/rpl_loaddata_map-slave.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt
mysql-test/suite/rpl/t/rpl_loaddata_map.test@stripped, 2008-01-31 16:51:52+08:00, hezx@stripped +5 -4
Post merge fix
mysql-test/suite/rpl/t/rpl_loaddata_map.test@stripped, 2008-01-31 16:51:03+08:00, hezx@stripped +0 -0
Rename: mysql-test/t/rpl_loaddata_map.test -> mysql-test/suite/rpl/t/rpl_loaddata_map.test
mysql-test/suite/rpl/t/rpl_user.test@stripped, 2008-01-31 16:51:52+08:00, hezx@stripped +4 -1
Post merge fix
mysql-test/suite/rpl/t/rpl_user.test@stripped, 2008-01-31 16:51:03+08:00, hezx@stripped +0 -0
Rename: mysql-test/t/rpl_user.test -> mysql-test/suite/rpl/t/rpl_user.test
diff -Nrup a/mysql-test/include/show_binlog_events2.inc b/mysql-test/include/show_binlog_events2.inc
--- a/mysql-test/include/show_binlog_events2.inc 2008-01-06 15:17:45 +08:00
+++ b/mysql-test/include/show_binlog_events2.inc 2008-01-31 16:51:52 +08:00
@@ -1,4 +1,4 @@
---let $binlog_start=98
+--let $binlog_start=106
--replace_result $binlog_start <binlog_start>
--replace_column 2 # 5 #
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
diff -Nrup a/mysql-test/r/rpl_loaddata_map.result b/mysql-test/r/rpl_loaddata_map.result
--- a/mysql-test/r/rpl_loaddata_map.result 2007-12-23 17:18:42 +08:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,28 +0,0 @@
-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 t2 (id int not null primary key auto_increment);
-select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;
-@@session.read_buffer_size - @@session.max_allowed_packet > 0
-1
-load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
-select count(*) from t2 /* 5 000 */;
-count(*)
-5000
-show binlog events in 'master-bin.000002' from 98;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000002 98 Query 1 # use `test`; create table t2 (id int not null primary key auto_increment)
-master-bin.000002 221 Begin_load_query 1 # ;file_id=1;block_len=7168
-master-bin.000002 7412 Append_block 1 # ;file_id=1;block_len=7168
-master-bin.000002 14603 Append_block 1 # ;file_id=1;block_len=2048
-master-bin.000002 16674 Append_block 1 # ;file_id=1;block_len=7168
-master-bin.000002 23865 Append_block 1 # ;file_id=1;block_len=341
-master-bin.000002 24229 Execute_load_query 1 # use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=1
-select count(*) from t2 /* 5 000 */;
-count(*)
-5000
-drop table t1, t2;
-end of the tests
diff -Nrup a/mysql-test/r/rpl_user.result b/mysql-test/r/rpl_user.result
--- a/mysql-test/r/rpl_user.result 2008-01-25 15:02:24 +08:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,42 +0,0 @@
-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;
-reset master;
-delete from mysql.user where Host='fakehost';
-create user 'foo'@'fakehost';
-create user 'foo'@'fakehost', 'bar'@'fakehost';
-ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost'
-create user 'foo'@'fakehost', 'bar'@'fakehost';
-ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost','bar'@'fakehost'
-select Host,User from mysql.user where Host='fakehost';
-Host User
-fakehost bar
-fakehost foo
-rename user 'foo'@'fakehost' to 'foofoo'@'fakehost';
-rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost';
-ERROR HY000: Operation RENAME USER failed for 'not_exist_user1'@'fakehost'
-rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'not_exist_user2'@'fakehost' to 'barfoo'@'fakehost';
-ERROR HY000: Operation RENAME USER failed for 'not_exist_user1'@'fakehost','not_exist_user2'@'fakehost'
-select Host,User from mysql.user where Host='fakehost';
-Host User
-fakehost barbar
-fakehost foofoo
-drop user 'foofoo'@'fakehost';
-drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost';
-ERROR HY000: Operation DROP USER failed for 'not_exist_user1'@'fakehost'
-drop user 'not_exist_user1'@'fakehost', 'not_exist_user2'@'fakehost';
-ERROR HY000: Operation DROP USER failed for 'not_exist_user1'@'fakehost','not_exist_user2'@'fakehost'
-select Host,User from mysql.user where Host='fakehost';
-Host User
-show binlog events from 98;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; delete from mysql.user where Host='fakehost'
-master-bin.000001 205 Query 1 # use `test`; create user 'foo'@'fakehost'
-master-bin.000001 296 Query 1 # use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'
-master-bin.000001 405 Query 1 # use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'
-master-bin.000001 519 Query 1 # use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'
-master-bin.000001 686 Query 1 # use `test`; drop user 'foofoo'@'fakehost'
-master-bin.000001 778 Query 1 # use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'
diff -Nrup a/mysql-test/suite/rpl/r/rpl_loaddata_map.result b/mysql-test/suite/rpl/r/rpl_loaddata_map.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_map.result 2008-01-31 16:51:52 +08:00
@@ -0,0 +1,28 @@
+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 t2 (id int not null primary key auto_increment);
+select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;
+@@session.read_buffer_size - @@session.max_allowed_packet > 0
+1
+load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
+select count(*) from t2 /* 5 000 */;
+count(*)
+5000
+show binlog events in 'master-bin.000002' from <binlog_start>;
+Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000002 # Query # # use `test`; create table t2 (id int not null primary key auto_increment)
+master-bin.000002 # Begin_load_query # # ;file_id=#;block_len=#
+master-bin.000002 # Append_block # # ;file_id=#;block_len=#
+master-bin.000002 # Append_block # # ;file_id=#;block_len=#
+master-bin.000002 # Append_block # # ;file_id=#;block_len=#
+master-bin.000002 # Append_block # # ;file_id=#;block_len=#
+master-bin.000002 # Execute_load_query # # use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
+select count(*) from t2 /* 5 000 */;
+count(*)
+5000
+drop table t1, t2;
+end of the tests
diff -Nrup a/mysql-test/suite/rpl/r/rpl_user.result b/mysql-test/suite/rpl/r/rpl_user.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/r/rpl_user.result 2008-01-31 16:51:52 +08:00
@@ -0,0 +1,44 @@
+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;
+reset master;
+set sql_log_bin=0;
+delete from mysql.user where Host='fakehost';
+set sql_log_bin=1;
+delete from mysql.user where Host='fakehost';
+create user 'foo'@'fakehost';
+create user 'foo'@'fakehost', 'bar'@'fakehost';
+ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost'
+create user 'foo'@'fakehost', 'bar'@'fakehost';
+ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost','bar'@'fakehost'
+select Host,User from mysql.user where Host='fakehost';
+Host User
+fakehost bar
+fakehost foo
+rename user 'foo'@'fakehost' to 'foofoo'@'fakehost';
+rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost';
+ERROR HY000: Operation RENAME USER failed for 'not_exist_user1'@'fakehost'
+rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'not_exist_user2'@'fakehost' to 'barfoo'@'fakehost';
+ERROR HY000: Operation RENAME USER failed for 'not_exist_user1'@'fakehost','not_exist_user2'@'fakehost'
+select Host,User from mysql.user where Host='fakehost';
+Host User
+fakehost barbar
+fakehost foofoo
+drop user 'foofoo'@'fakehost';
+drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost';
+ERROR HY000: Operation DROP USER failed for 'not_exist_user1'@'fakehost'
+drop user 'not_exist_user1'@'fakehost', 'not_exist_user2'@'fakehost';
+ERROR HY000: Operation DROP USER failed for 'not_exist_user1'@'fakehost','not_exist_user2'@'fakehost'
+select Host,User from mysql.user where Host='fakehost';
+Host User
+show binlog events from <binlog_start>;
+Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # Query # # use `test`; create user 'foo'@'fakehost'
+master-bin.000001 # Query # # use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'
+master-bin.000001 # Query # # use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'
+master-bin.000001 # Query # # use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'
+master-bin.000001 # Query # # use `test`; drop user 'foofoo'@'fakehost'
+master-bin.000001 # Query # # use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'
diff -Nrup a/mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt b/mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt 2008-01-31 16:51:03 +08:00
@@ -0,0 +1 @@
+--read_buffer_size=9K --max_allowed_packet=8K
diff -Nrup a/mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt b/mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt 2008-01-31 16:51:03 +08:00
@@ -0,0 +1 @@
+--max_allowed_packet=8K
diff -Nrup a/mysql-test/suite/rpl/t/rpl_loaddata_map.test b/mysql-test/suite/rpl/t/rpl_loaddata_map.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_map.test 2008-01-31 16:51:52 +08:00
@@ -0,0 +1,53 @@
+#
+# check replication of load data with the server parameters subjected to
+# read_buffer_size > max_allowed_packet
+#
+# BUG#30435 loading large LOAD DATA INFILE breaks slave with
+# read_buffer_size set on master
+# BUG#33413 show binlog events fails if binlog has event size of close
+# to max_allowed_packet
+
+source include/have_binlog_format_mixed_or_statement.inc;
+source include/master-slave.inc;
+source include/have_innodb.inc;
+
+--disable_query_log
+let $rows= 5000;
+create table t1 (id int not null primary key auto_increment);
+
+while($rows)
+{
+ eval insert into t1 values (null);
+ dec $rows;
+}
+eval select * into outfile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' from t1;
+flush logs;
+--enable_query_log
+
+connection master;
+create table t2 (id int not null primary key auto_increment);
+
+select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data infile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
+select count(*) from t2 /* 5 000 */;
+
+# the binglog will show fragmented Append_block events
+--let $binlog_start=106
+--replace_column 2 # 4 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
+--eval show binlog events in 'master-bin.000002' from $binlog_start
+
+
+sync_slave_with_master;
+#connection slave;
+select count(*) from t2 /* 5 000 */;
+
+connection master;
+drop table t1, t2;
+sync_slave_with_master;
+remove_file $MYSQLTEST_VARDIR/tmp/bug30435_5k.txt;
+
+--echo end of the tests
diff -Nrup a/mysql-test/suite/rpl/t/rpl_user.test b/mysql-test/suite/rpl/t/rpl_user.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_user.test 2008-01-31 16:51:52 +08:00
@@ -0,0 +1,59 @@
+# BUG#33862 completely failed DROP USER statement gets replicated
+
+--source include/master-slave.inc
+
+reset master;
+
+#
+# remove all users will be used in the test
+#
+set sql_log_bin=0;
+delete from mysql.user where Host='fakehost';
+set sql_log_bin=1;
+connection slave;
+delete from mysql.user where Host='fakehost';
+
+#
+# Test create user
+#
+connection master;
+create user 'foo'@'fakehost';
+--error ER_CANNOT_USER
+create user 'foo'@'fakehost', 'bar'@'fakehost';
+--error ER_CANNOT_USER
+create user 'foo'@'fakehost', 'bar'@'fakehost';
+
+sync_slave_with_master;
+select Host,User from mysql.user where Host='fakehost';
+
+#
+# Test rename user
+#
+connection master;
+rename user 'foo'@'fakehost' to 'foofoo'@'fakehost';
+--error ER_CANNOT_USER
+rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost';
+--error ER_CANNOT_USER
+rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'not_exist_user2'@'fakehost' to 'barfoo'@'fakehost';
+
+sync_slave_with_master;
+select Host,User from mysql.user where Host='fakehost';
+
+#
+# Test drop user
+#
+connection master;
+drop user 'foofoo'@'fakehost';
+--error ER_CANNOT_USER
+drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost';
+--error ER_CANNOT_USER
+drop user 'not_exist_user1'@'fakehost', 'not_exist_user2'@'fakehost';
+
+sync_slave_with_master;
+select Host,User from mysql.user where Host='fakehost';
+
+#
+# show the binlog events on the master
+#
+connection master;
+source include/show_binlog_events.inc;
diff -Nrup a/mysql-test/t/rpl_loaddata_map-master.opt b/mysql-test/t/rpl_loaddata_map-master.opt
--- a/mysql-test/t/rpl_loaddata_map-master.opt 2007-12-22 04:34:41 +08:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1 +0,0 @@
---read_buffer_size=9K --max_allowed_packet=8K
diff -Nrup a/mysql-test/t/rpl_loaddata_map-slave.opt b/mysql-test/t/rpl_loaddata_map-slave.opt
--- a/mysql-test/t/rpl_loaddata_map-slave.opt 2007-12-22 04:34:41 +08:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1 +0,0 @@
---max_allowed_packet=8K
diff -Nrup a/mysql-test/t/rpl_loaddata_map.test b/mysql-test/t/rpl_loaddata_map.test
--- a/mysql-test/t/rpl_loaddata_map.test 2007-12-23 17:18:43 +08:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,52 +0,0 @@
-#
-# check replication of load data with the server parameters subjected to
-# read_buffer_size > max_allowed_packet
-#
-# BUG#30435 loading large LOAD DATA INFILE breaks slave with
-# read_buffer_size set on master
-# BUG#33413 show binlog events fails if binlog has event size of close
-# to max_allowed_packet
-
-source include/master-slave.inc;
-source include/have_innodb.inc;
-
---disable_query_log
-let $rows= 5000;
-create table t1 (id int not null primary key auto_increment);
-
-while($rows)
-{
- eval insert into t1 values (null);
- dec $rows;
-}
-eval select * into outfile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' from t1;
-flush logs;
---enable_query_log
-
-connection master;
-create table t2 (id int not null primary key auto_increment);
-
-select @@session.read_buffer_size - @@session.max_allowed_packet > 0 ;
-
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval load data infile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
-select count(*) from t2 /* 5 000 */;
-
-# the binglog will show fragmented Append_block events
---let $binlog_start=98
---replace_column 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---eval show binlog events in 'master-bin.000002' from $binlog_start
-
-
-sync_slave_with_master;
-#connection slave;
-select count(*) from t2 /* 5 000 */;
-
-connection master;
-drop table t1, t2;
-sync_slave_with_master;
-remove_file $MYSQLTEST_VARDIR/tmp/bug30435_5k.txt;
-
---echo end of the tests
diff -Nrup a/mysql-test/t/rpl_user.test b/mysql-test/t/rpl_user.test
--- a/mysql-test/t/rpl_user.test 2008-01-25 15:02:24 +08:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,56 +0,0 @@
-# BUG#33862 completely failed DROP USER statement gets replicated
-
---source include/master-slave.inc
-
-reset master;
-
-#
-# remove all users will be used in the test
-#
-delete from mysql.user where Host='fakehost';
-sync_slave_with_master;
-
-#
-# Test create user
-#
-connection master;
-create user 'foo'@'fakehost';
---error ER_CANNOT_USER
-create user 'foo'@'fakehost', 'bar'@'fakehost';
---error ER_CANNOT_USER
-create user 'foo'@'fakehost', 'bar'@'fakehost';
-
-sync_slave_with_master;
-select Host,User from mysql.user where Host='fakehost';
-
-#
-# Test rename user
-#
-connection master;
-rename user 'foo'@'fakehost' to 'foofoo'@'fakehost';
---error ER_CANNOT_USER
-rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost';
---error ER_CANNOT_USER
-rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'not_exist_user2'@'fakehost' to 'barfoo'@'fakehost';
-
-sync_slave_with_master;
-select Host,User from mysql.user where Host='fakehost';
-
-#
-# Test drop user
-#
-connection master;
-drop user 'foofoo'@'fakehost';
---error ER_CANNOT_USER
-drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost';
---error ER_CANNOT_USER
-drop user 'not_exist_user1'@'fakehost', 'not_exist_user2'@'fakehost';
-
-sync_slave_with_master;
-select Host,User from mysql.user where Host='fakehost';
-
-#
-# show the binlog events on the master
-#
-connection master;
-source include/show_binlog_events.inc;
| Thread |
|---|
| • bk commit into 5.1 tree (hezx:1.2680) | hezx | 31 Jan |
