Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-06-07 16:01:00+02:00, msvensson@pilot.(none) +24 -0
Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369
into pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369
MERGE: 1.1810.2939.29
BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3@stripped, 2007-06-07 15:59:31+02:00, msvensson@pilot.(none) +0 -0
SCCS merged
MERGE: 1.1.3.2
BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3@stripped, 2007-06-07 15:58:53+02:00, msvensson@pilot.(none) +0 -0
Merge rename: BitKeeper/deleted/.del-ctype_cp932_notembedded.result -> BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42@stripped, 2007-06-07 15:59:35+02:00, msvensson@pilot.(none) +0 -0
SCCS merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42@stripped, 2007-06-07 15:59:11+02:00, msvensson@pilot.(none) +0 -0
Merge rename: BitKeeper/deleted/.del-ctype_cp932_notembedded.test -> BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42
BitKeeper/deleted/.del-sp_trans_log.result@stripped, 2007-06-07 15:59:18+02:00, msvensson@pilot.(none) +0 -0
Delete: mysql-test/r/sp_trans_log.result
BitKeeper/deleted/.del-sp_trans_log.test@stripped, 2007-06-07 15:59:09+02:00, msvensson@pilot.(none) +0 -0
Delete: mysql-test/t/sp_trans_log.test
mysql-test/extra/binlog_tests/binlog.test@stripped, 2007-06-07 16:00:58+02:00, msvensson@pilot.(none) +0 -0
Merge 5.0->5.1
MERGE: 1.4.3.2
mysql-test/extra/binlog_tests/binlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Merge rename: mysql-test/t/binlog.test -> mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/binlog_tests/blackhole.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.4.6.2
mysql-test/extra/binlog_tests/blackhole.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Merge rename: mysql-test/t/blackhole.test -> mysql-test/extra/binlog_tests/blackhole.test
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.2.4.2
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Merge rename: mysql-test/t/ctype_cp932_binlog.test -> mysql-test/extra/binlog_tests/ctype_cp932_binlog.test
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.5.2.2
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Merge rename: mysql-test/t/ctype_ucs_binlog.test -> mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
mysql-test/extra/binlog_tests/drop_temp_table.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.8.1.2
mysql-test/extra/binlog_tests/drop_temp_table.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Merge rename: mysql-test/t/drop_temp_table.test -> mysql-test/extra/binlog_tests/drop_temp_table.test
mysql-test/extra/binlog_tests/insert_select-binlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.2.1.2
mysql-test/extra/binlog_tests/insert_select-binlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Merge rename: mysql-test/t/insert_select-binlog.test -> mysql-test/extra/binlog_tests/insert_select-binlog.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.20.8.2
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Merge rename: mysql-test/t/mix_innodb_myisam_binlog.test -> mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/include/master-slave.inc@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.12.1.2
mysql-test/lib/mtr_cases.pl@stripped, 2007-06-07 16:00:58+02:00, msvensson@pilot.(none) +1 -1
Merge 5.0->5.1
MERGE: 1.12.1.27
mysql-test/r/sp_trans.result@stripped, 2007-06-07 16:00:58+02:00, msvensson@pilot.(none) +0 -0
Merge 5.0->5.1
MERGE: 1.7.1.7
mysql-test/t/innodb.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.118.2.14
mysql-test/t/mysqlbinlog-cp932.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.1.1.2
mysql-test/t/mysqlbinlog.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.21.1.26
mysql-test/t/mysqlbinlog2.test@stripped, 2007-06-07 16:00:58+02:00, msvensson@pilot.(none) +0 -0
Merge 5.0->5.1
MERGE: 1.7.1.3
mysql-test/t/mysqldump.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.76.1.40
mysql-test/t/rpl000017.test@stripped, 2007-06-07 16:00:58+02:00, msvensson@pilot.(none) +0 -2
Merge 5.0->5.1
MERGE: 1.13.1.3
mysql-test/t/rpl_000015.test@stripped, 2007-06-07 16:00:58+02:00, msvensson@pilot.(none) +0 -1
Merge 5.0->5.1
MERGE: 1.31.8.2
mysql-test/t/rpl_000015.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Merge rename: mysql-test/t/rpl000015.test -> mysql-test/t/rpl_000015.test
mysql-test/t/rpl_rotate_logs.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.63.1.6
mysql-test/t/sp_trans.test@stripped, 2007-06-07 15:58:49+02:00, msvensson@pilot.(none) +0 -0
Auto merged
MERGE: 1.9.1.5
mysql-test/t/user_var-binlog.test@stripped, 2007-06-07 16:00:58+02:00, msvensson@pilot.(none) +1 -1
Merge 5.0->5.1
MERGE: 1.3.1.2
# 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: msvensson
# Host: pilot.(none)
# Root: /data/msvensson/mysql/bug28369/my51-bug28369/RESYNC
--- 1.4.6.1/mysql-test/t/blackhole.test 2007-06-07 15:58:33 +02:00
+++ 1.16/mysql-test/extra/binlog_tests/blackhole.test 2007-06-07 15:58:49 +02:00
@@ -122,10 +122,7 @@ select * from t2;
select * from t3;
let $VERSION=`select version()`;
---replace_result $VERSION VERSION
---replace_column 2 # 5 #
-show binlog events;
-
+source include/show_binlog_events.inc;
drop table t1,t2,t3;
#
@@ -144,3 +141,20 @@ DELETE FROM t1 WHERE a=10;
DROP TABLE t1;
# End of 4.1 tests
+# Test that a transaction which is rolled back does not go into binlog
+# and that a transaction which is committed does
+
+reset master;
+create table t1 (a int) engine=blackhole;
+set autocommit=0;
+start transaction;
+insert into t1 values(1);
+commit;
+start transaction;
+insert into t1 values(2);
+rollback;
+set autocommit=1;
+source include/show_binlog_events.inc;
+drop table if exists t1;
+
+# End of 5.0 tests
--- 1.46/mysql-test/t/mysqlbinlog.test 2007-04-10 12:51:42 +02:00
+++ 1.47/mysql-test/t/mysqlbinlog.test 2007-06-07 15:58:49 +02:00
@@ -2,8 +2,7 @@
# TODO: Need to look at making a row based version once the new row based client is completed. [jbm]
-- source include/have_binlog_format_mixed_or_statement.inc
-# Embedded server doesn't support binlogging
--- source include/not_embedded.inc
+-- source include/have_binlog.inc
# we need this for getting fixed timestamps inside of this test
set timestamp=1000000000;
--- 1.8.1.1/mysql-test/t/drop_temp_table.test 2007-06-07 15:58:33 +02:00
+++ 1.12/mysql-test/extra/binlog_tests/drop_temp_table.test 2007-06-07 15:58:49 +02:00
@@ -23,9 +23,7 @@ connection con2;
# To be sure that logging has been done, we use a user lock.
select get_lock("a",10);
let $VERSION=`select version()`;
---replace_result $VERSION VERSION
---replace_column 2 # 5 #
-show binlog events;
+source include/show_binlog_events.inc;
drop database `drop-temp+table-test`;
# End of 4.1 tests
--- 1.20.8.1/mysql-test/t/mix_innodb_myisam_binlog.test 2007-06-07 15:58:33 +02:00
+++ 1.39/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2007-06-07 15:58:49 +02:00
@@ -7,6 +7,7 @@
-- source include/have_binlog.inc
-- source include/have_innodb.inc
+-- source include/have_debug.inc
--disable_warnings
drop table if exists t1, t2;
@@ -26,9 +27,7 @@ insert into t1 values(1);
insert into t2 select * from t1;
commit;
---replace_column 5 #
---replace_result "xid=14" "xid=8"
-show binlog events from 98;
+source include/show_binlog_events.inc;
delete from t1;
delete from t2;
@@ -40,8 +39,7 @@ insert into t2 select * from t1;
# should say some changes to non-transact1onal tables couldn't be rolled back
rollback;
---replace_column 5 #
-show binlog events from 98;
+source include/show_binlog_events.inc;
delete from t1;
delete from t2;
@@ -55,9 +53,7 @@ insert into t2 select * from t1;
rollback to savepoint my_savepoint;
commit;
---replace_column 5 #
---replace_result "xid=47" "xid=25"
-show binlog events from 98;
+source include/show_binlog_events.inc;
delete from t1;
delete from t2;
@@ -73,9 +69,7 @@ insert into t1 values(7);
commit;
select a from t1 order by a; # check that savepoints work :)
---replace_column 5 #
---replace_result "xid=69" "xid=37"
-show binlog events from 98;
+source include/show_binlog_events.inc;
# and when ROLLBACK is not explicit?
delete from t1;
@@ -95,8 +89,7 @@ connection con2;
# so SHOW BINLOG EVENTS may come before con1 does the loggin. To be sure that
# logging has been done, we use a user lock.
select get_lock("a",10);
---replace_column 5 #
-show binlog events from 98;
+source include/show_binlog_events.inc;
# and when not in a transact1on?
delete from t1;
@@ -106,9 +99,7 @@ reset master;
insert into t1 values(9);
insert into t2 select * from t1;
---replace_column 5 #
---replace_result "xid=117" "xid=60"
-show binlog events from 98;
+source include/show_binlog_events.inc;
# Check that when the query updat1ng the MyISAM table is the first in the
# transaction, we log it immediately.
@@ -119,16 +110,11 @@ reset master;
insert into t1 values(10); # first make t1 non-empty
begin;
insert into t2 select * from t1;
---replace_column 5 #
---replace_result "xid=131" "xid=66"
-show binlog events from 98;
+source include/show_binlog_events.inc;
insert into t1 values(11);
commit;
---replace_column 5 #
---replace_result "xid=131" "xid=66" "xid=134" "xid=68"
-show binlog events from 98;
-
+source include/show_binlog_events.inc;
# Check that things work like before this BEGIN/ROLLBACK code was added,
# when t2 is INNODB
@@ -144,9 +130,7 @@ insert into t1 values(12);
insert into t2 select * from t1;
commit;
---replace_column 5 #
---replace_result "xid=153" "xid=78"
-show binlog events from 98;
+source include/show_binlog_events.inc;
delete from t1;
delete from t2;
@@ -157,8 +141,7 @@ insert into t1 values(13);
insert into t2 select * from t1;
rollback;
---replace_column 5 #
-show binlog events from 98;
+source include/show_binlog_events.inc;
delete from t1;
delete from t2;
@@ -172,9 +155,7 @@ insert into t2 select * from t1;
rollback to savepoint my_savepoint;
commit;
---replace_column 5 #
---replace_result "xid=185" "xid=94"
-show binlog events from 98;
+source include/show_binlog_events.inc;
delete from t1;
delete from t2;
@@ -190,9 +171,7 @@ insert into t1 values(18);
commit;
select a from t1 order by a; # check that savepoints work :)
---replace_column 5 #
---replace_result "xid=206" "xid=105"
-show binlog events from 98;
+source include/show_binlog_events.inc;
# Test for BUG#5714, where a MyISAM update in the transaction used to
# release row-level locks in InnoDB
@@ -203,7 +182,7 @@ connection con3;
delete from t1;
delete from t2;
--disable_warnings
-alter table t2 type=MyISAM;
+alter table t2 engine=MyISAM;
--enable_warnings
insert into t1 values (1);
begin;
@@ -228,8 +207,8 @@ select (@after-@before) >= 2;
drop table t1,t2;
commit;
-# test for BUG#7947 - DO RELEASE_LOCK() not written to binlog on rollback in the middle
-# of a transaction
+# test for BUG#7947 - DO RELEASE_LOCK() not written to binlog on rollback in
+# the middle of a transaction
connection con2;
begin;
@@ -251,14 +230,73 @@ insert into t2 values (3);
disconnect con2;
connection con3;
select get_lock("lock1",60);
---replace_column 5 #
---replace_result "xid=206" "xid=105" "xid=224" "xid=114" "xid=227" "xid=115" "xid=231" "xid=117" "xid=258" "xid=132"
-show binlog events from 98;
+source include/show_binlog_events.inc;
do release_lock("lock1");
drop table t0,t2;
# End of 4.1 tests
+#
+# Test behaviour of CREATE ... SELECT when mixing MyISAM and InnoDB tables
+#
+
+set autocommit=0;
+CREATE TABLE t1 (a int, b int) engine=myisam;
+reset master;
+INSERT INTO t1 values (1,1),(1,2);
+--error ER_DUP_ENTRY_WITH_KEY_NAME
+CREATE TABLE t2 (primary key (a)) engine=innodb select * from t1;
+# This should give warning
+DROP TABLE if exists t2;
+INSERT INTO t1 values (3,3);
+--error ER_DUP_ENTRY_WITH_KEY_NAME
+CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;
+ROLLBACK;
+# This should give warning
+DROP TABLE IF EXISTS t2;
+
+CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb;
+INSERT INTO t1 VALUES (4,4);
+--error ER_DUP_ENTRY_WITH_KEY_NAME
+CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
+SELECT * from t2;
+TRUNCATE table t2;
+INSERT INTO t1 VALUES (5,5);
+--error ER_DUP_ENTRY_WITH_KEY_NAME
+INSERT INTO t2 select * from t1;
+SELECT * FROM t2;
+DROP TABLE t2;
+
+INSERT INTO t1 values (6,6);
+CREATE TEMPORARY TABLE t2 (a int, b int, primary key (a)) engine=innodb ;
+INSERT INTO t1 values (7,7);
+ROLLBACK;
+INSERT INTO t1 values (8,8);
+--error ER_DUP_ENTRY_WITH_KEY_NAME
+CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
+COMMIT;
+INSERT INTO t1 values (9,9);
+--error ER_DUP_ENTRY_WITH_KEY_NAME
+CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
+ROLLBACK;
+SELECT * from t2;
+TRUNCATE table t2;
+INSERT INTO t1 values (10,10);
+--error ER_DUP_ENTRY_WITH_KEY_NAME
+INSERT INTO t2 select * from t1;
+SELECT * from t1;
+INSERT INTO t2 values (100,100);
+--error ER_DUP_ENTRY_WITH_KEY_NAME
+CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
+COMMIT;
+INSERT INTO t2 values (101,101);
+--error ER_DUP_ENTRY_WITH_KEY_NAME
+CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
+ROLLBACK;
+SELECT * from t2;
+DROP TABLE t1,t2;
+source include/show_binlog_events.inc;
+
# Test for BUG#16559 (ROLLBACK should always have a zero error code in
# binlog). Has to be here and not earlier, as the SELECTs influence
# XIDs differently between normal and ps-protocol (and SHOW BINLOG
@@ -278,16 +316,3 @@ disconnect con3;
connection con4;
select get_lock("a",10); # wait for rollback to finish
-# we check that the error code of the "ROLLBACK" event is 0 and not
-# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
-# and does not make slave to stop)
---exec $MYSQL_BINLOG --start-position=547 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval select
-(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
-is not null;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval select
-@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
-@a not like "%#%error_code=%error_code=%";
-drop table t1, t2;
--- 1.15/mysql-test/t/mysqlbinlog2.test 2007-04-05 21:34:30 +02:00
+++ 1.16/mysql-test/t/mysqlbinlog2.test 2007-06-07 16:00:58 +02:00
@@ -4,8 +4,7 @@
# TODO: Need to look at making row based version once new binlog client is complete.
-- source include/have_binlog_format_mixed_or_statement.inc
-# Embedded server doesn't support binlogging
--- source include/not_embedded.inc
+-- source include/have_binlog.inc
--disable_warnings
drop table if exists t1;
--- 1.2.4.1/mysql-test/t/ctype_cp932_binlog.test 2007-06-07 15:58:33 +02:00
+++ 1.11/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test 2007-06-07 15:58:49 +02:00
@@ -27,32 +27,9 @@ SET @var1= x'8300';
# code (and I have used it to test the fix) until there is some way to
# exercise this code from mysql-test-run.
EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 98;
+source include/show_binlog_events.inc;
SELECT HEX(f1) FROM t1;
DROP table t1;
# end test for bug#11338
# End of 4.1 tests
-
-#
-# Bug#18293: Values in stored procedure written to binlog unescaped
-#
-
-delimiter |;
-CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
- s2 CHAR(50) CHARACTER SET cp932,
- d DECIMAL(10,2))|
-CREATE PROCEDURE bug18293 (IN ins1 CHAR(50),
- IN ins2 CHAR(50) CHARACTER SET cp932,
- IN ind DECIMAL(10,2))
- BEGIN
- INSERT INTO t4 VALUES (ins1, ins2, ind);
- END|
-CALL bug18293("Foo's a Bar", _cp932 0xED40ED41ED42, 47.93)|
-SELECT HEX(s1),HEX(s2),d FROM t4|
-DROP PROCEDURE bug18293|
-DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 362|
-delimiter ;|
-
-# End of 5.0 tests
--- 1.5.2.1/mysql-test/t/ctype_ucs_binlog.test 2007-06-07 15:58:33 +02:00
+++ 1.12/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test 2007-06-07 15:58:49 +02:00
@@ -10,10 +10,11 @@ create table t2 (c char(30)) charset=ucs
set @v=convert('abc' using ucs2);
reset master;
insert into t2 values (@v);
-show binlog events from 98;
+source include/show_binlog_events.inc;
# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
# absolutely need variables names to be quoted and strings to be
# escaped).
+flush logs;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001
drop table t2;
--- 1.2.1.1/mysql-test/t/insert_select-binlog.test 2007-06-07 15:58:33 +02:00
+++ 1.8/mysql-test/extra/binlog_tests/insert_select-binlog.test 2007-06-07 15:58:49 +02:00
@@ -2,6 +2,10 @@
-- source include/not_embedded.inc
-- source include/have_binlog.inc
+--disable_warnings
+drop table if exists t1,t2;
+--enable_warnings
+
# Check if a partly-completed INSERT SELECT in a MyISAM table goes into the
# binlog
@@ -10,13 +14,12 @@ insert into t1 values(2);
create table t2(a int);
insert into t2 values(1),(2);
reset master;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
insert into t1 select * from t2;
# The above should produce an error, but still be in the binlog;
# verify the binlog :
let $VERSION=`select version()`;
---replace_result $VERSION VERSION
-show binlog events;
+source include/show_binlog_events.inc;
select * from t1;
drop table t1, t2;
@@ -25,12 +28,11 @@ drop table t1, t2;
create table t1(a int);
insert into t1 values(1),(1);
reset master;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
create table t2(unique(a)) select a from t1;
# The above should produce an error, *and* not appear in the binlog
let $VERSION=`select version()`;
---replace_result $VERSION VERSION
-show binlog events;
+source include/show_binlog_events.inc;
drop table t1;
# End of 4.1 tests
--- 1.10/mysql-test/t/user_var-binlog.test 2007-03-29 21:37:59 +02:00
+++ 1.11/mysql-test/t/user_var-binlog.test 2007-06-07 16:00:58 +02:00
@@ -1,8 +1,7 @@
+-- source include/have_binlog.inc
# Requires statement logging
-- source include/have_binlog_format_mixed_or_statement.inc
# TODO: Create row based version once $MYSQL_BINLOG has new RB version
-# Embedded server does not support binlogging
---source include/not_embedded.inc
# Check that user variables are binlogged correctly (BUG#3875)
create table t1 (a varchar(50));
--- 1.4/mysql-test/t/mysqlbinlog-cp932.test 2007-03-21 09:27:43 +01:00
+++ 1.5/mysql-test/t/mysqlbinlog-cp932.test 2007-06-07 15:58:49 +02:00
@@ -3,6 +3,7 @@
-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/have_cp932.inc
+-- source include/have_binlog.inc
# Bug#16217 (mysql client did not know how not switch its internal charset)
flush logs;
--- 1.58/mysql-test/lib/mtr_cases.pl 2007-04-27 19:03:47 +02:00
+++ 1.59/mysql-test/lib/mtr_cases.pl 2007-06-07 16:00:58 +02:00
@@ -596,6 +596,22 @@ sub collect_one_test_case($$$$$$$) {
}
}
+ if ( $tinfo->{'need_binlog'} )
+ {
+ if (grep(/^--skip-log-bin/, @::opt_extra_mysqld_opt) )
+ {
+ $tinfo->{'skip'}= 1;
+ $tinfo->{'comment'}= "Test need binlog";
+ return;
+ }
+ }
+ else
+ {
+ # Test does not need binlog, add --skip-binlog to
+ # the options used when starting it
+ push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
+ }
+
}
}
@@ -606,6 +622,7 @@ our @tags=
(
["include/have_innodb.inc", "innodb_test", 1],
["include/have_binlog_format_row.inc", "binlog_format", "row"],
+ ["include/have_binlog.inc", "need_binlog", 1],
["include/have_binlog_format_statement.inc", "binlog_format", "statement"],
["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"],
["include/big_test.inc", "big_test", 1],
--- 1.162/mysql-test/t/innodb.test 2007-04-19 04:00:06 +02:00
+++ 1.163/mysql-test/t/innodb.test 2007-06-07 15:58:49 +02:00
@@ -13,6 +13,7 @@
-- source include/not_embedded.inc
-- source include/have_innodb.inc
+-- source include/have_binlog.inc
#
# Small basic test with ignore
--- 1.1.3.1/BitKeeper/deleted/.del-ctype_cp932_notembedded.result 2007-06-07 15:55:50 +02:00
+++ 1.6/BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3 2007-06-07 15:59:31 +02:00
@@ -6,10 +6,11 @@ CREATE TABLE t1(f1 blob);
PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
SET @var1= x'8300';
EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 98;
+SHOW BINLOG EVENTS FROM 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 188 use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001 188 Query 1 283 use `test`; INSERT INTO t1 VALUES(0x8300)
+master-bin.000001 102 Query 1 189 use `test`; CREATE TABLE t1(f1 blob)
+master-bin.000001 189 User var 1 228 @`var1`=_binary 0x8300 COLLATE binary
+master-bin.000001 228 Query 1 321 use `test`; INSERT INTO t1 VALUES(@'var1')
SELECT HEX(f1) FROM t1;
HEX(f1)
8300
--- 1.1.1.1/BitKeeper/deleted/.del-ctype_cp932_notembedded.test 2007-06-07 15:55:49 +02:00
+++ 1.4/BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42 2007-06-07 15:59:35 +02:00
@@ -26,7 +26,7 @@ SET @var1= x'8300';
# code (and I have used it to test the fix) until there is some way to
# exercise this code from mysql-test-run.
EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 98;
+SHOW BINLOG EVENTS FROM 102;
SELECT HEX(f1) FROM t1;
DROP table t1;
# end test for bug#11338
--- 1.139/mysql-test/t/mysqldump.test 2007-05-01 06:29:03 +02:00
+++ 1.140/mysql-test/t/mysqldump.test 2007-06-07 15:58:49 +02:00
@@ -1,5 +1,6 @@
# Embedded server doesn't support external clients
--source include/not_embedded.inc
+--source include/have_binlog.inc
--disable_warnings
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
--- 1.14/mysql-test/include/master-slave.inc 2006-10-04 16:33:22 +02:00
+++ 1.15/mysql-test/include/master-slave.inc 2007-06-07 15:58:49 +02:00
@@ -1,3 +1,6 @@
+# Replication tests need binlog
+source include/have_binlog.inc;
+
connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
--- 1.31.8.1/mysql-test/t/rpl000015.test 2007-06-07 15:58:33 +02:00
+++ 1.42/mysql-test/t/rpl_000015.test 2007-06-07 16:00:58 +02:00
@@ -1,4 +1,9 @@
-- source include/have_binlog.inc
+#####################
+# Change Author: JBM
+# Change Date: 2006-01-17
+# Change: added order by in select
+#####################
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
@@ -32,12 +37,12 @@ connection master;
--disable_warnings
drop table if exists t1;
--enable_warnings
-create table t1 (n int);
+create table t1 (n int, PRIMARY KEY(n));
insert into t1 values (10),(45),(90);
sync_slave_with_master;
-select * from t1;
+connection slave;
+SELECT * FROM t1 ORDER BY n;
connection master;
+SELECT * FROM t1 ORDER BY n;
drop table t1;
sync_slave_with_master;
-
-# End of 4.1 tests
--- 1.70/mysql-test/t/rpl_rotate_logs.test 2007-05-24 12:03:52 +02:00
+++ 1.71/mysql-test/t/rpl_rotate_logs.test 2007-06-07 15:58:49 +02:00
@@ -1,6 +1,8 @@
# This test uses chmod, can't be run with root permissions
-- source include/not_as_root.inc
+-- source include/have_binlog.inc
+
#
# Test is run with max_binlog_size=2048 to force automatic rotation of the
# binary log
--- 1.4.3.1/mysql-test/t/binlog.test 2007-06-07 15:58:33 +02:00
+++ 1.20/mysql-test/extra/binlog_tests/binlog.test 2007-06-07 16:00:58 +02:00
@@ -1,17 +1,18 @@
#
# misc binlogging tests that do not require a slave running
#
+
-- source include/not_embedded.inc
--- source include/have_bdb.inc
-- source include/have_innodb.inc
-- source include/have_binlog.inc
+-- source include/have_debug.inc
--disable_warnings
drop table if exists t1, t2;
--enable_warnings
reset master;
-create table t1 (a int) engine=bdb;
+create table t1 (a int) engine=innodb;
create table t2 (a int) engine=innodb;
begin;
insert t1 values (5);
@@ -20,9 +21,7 @@ begin;
insert t2 values (5);
commit;
# first COMMIT must be Query_log_event, second - Xid_log_event
---replace_result "xid=21" "xid=12"
---replace_column 2 # 5 #
-show binlog events from 98;
+source include/show_binlog_events.inc;
drop table t1,t2;
#
@@ -42,9 +41,62 @@ while ($1)
--enable_query_log
commit;
drop table t1;
---replace_result "xid=32" "xid=19"
--replace_column 2 # 5 #
-show binlog events in 'master-bin.000001' from 98;
+--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
+show binlog events in 'master-bin.000001' from 106;
--replace_column 2 # 5 #
-show binlog events in 'master-bin.000002' from 98;
+--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
+show binlog events in 'master-bin.000002' from 106;
+
+# Test of a too big SET INSERT_ID: see if the truncated value goes
+# into binlog (right), or the too big value (wrong); we look at the
+# binlog further down with SHOW BINLOG EVENTS.
+reset master;
+create table t1 (id tinyint auto_increment primary key);
+set insert_id=128;
+insert into t1 values(null);
+select * from t1;
+drop table t1;
+
+# bug#22027
+create table t1 (a int);
+create table if not exists t2 select * from t1;
+
+# bug#22762
+create temporary table tt1 (a int);
+create table if not exists t3 like tt1;
+
+# BUG#25091 (A DELETE statement to mysql database is not logged with
+# ROW mode format): Checking that some basic operations on tables in
+# the mysql database is replicated even when the current database is
+# 'mysql'.
+
+--disable_warnings
+USE mysql;
+INSERT INTO user SET host='localhost', user='@#@', password=password('Just a test');
+UPDATE user SET password=password('Another password') WHERE host='localhost' AND user='@#@';
+DELETE FROM user WHERE host='localhost' AND user='@#@';
+--enable_warnings
+
+use test;
+source include/show_binlog_events.inc;
+drop table t1,t2,t3,tt1;
+-- source extra/binlog_tests/binlog_insert_delayed.test
+
+#Bug #26079 max_binlog_size + innodb = not make new binlog and hang server
+# server should not hang, binlog must rotate in the end
+reset master;
+--disable_warnings
+drop table if exists t3;
+--enable_warnings
+create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb;
+show master status;
+let $it=4;
+while ($it)
+{
+insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaa');
+dec $it;
+}
+show master status /* must show new binlog index after rotating */;
+drop table t3;
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2517) | msvensson | 7 Jun |
