Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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-31 08:41:44+02:00, df@stripped +17 -0
some tests require binlog enabled
mysql-test/r/mix_innodb_myisam_binlog.result@stripped, 2007-05-31 08:41:43+02:00, df@stripped +15 -15
have_log_bin.inc increases transaction count by one
mysql-test/t/bdb_notembedded.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
requires binlog for now
mysql-test/t/binlog.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
obviously requires binlog
mysql-test/t/blackhole.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
requires binlog for now
mysql-test/t/ctype_cp932_binlog.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
requires binlog
mysql-test/t/ctype_cp932_notembedded.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
requires binlog for now
mysql-test/t/ctype_ucs_binlog.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
requires binlog
mysql-test/t/drop_temp_table.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
requires binlog for now
mysql-test/t/flush_block_commit_notembedded.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +2 -0
requires binlog for now
mysql-test/t/insert_select-binlog.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
requires binlog
mysql-test/t/mix_innodb_myisam_binlog.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -1
requires binlog
mysql-test/t/mysqlbinlog-cp932.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +2 -1
requires binlog
mysql-test/t/mysqlbinlog.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +2 -0
requires binlog
mysql-test/t/mysqlbinlog2.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +2 -0
requires binlog
mysql-test/t/mysqltest.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +2 -0
requires binlog for now
mysql-test/t/sp_trans.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
requires binlog for now
mysql-test/t/user_var-binlog.test@stripped, 2007-05-31 08:41:43+02:00, df@stripped +1 -0
requires binlog
# 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: df
# Host: pippilotta.erinye.com
# Root: /shared/home/df/mysql/build/mysql-5.0-build-work-nn
--- 1.9/mysql-test/t/blackhole.test 2007-02-14 17:35:53 +01:00
+++ 1.10/mysql-test/t/blackhole.test 2007-05-31 08:41:43 +02:00
@@ -4,6 +4,7 @@
#
-- source include/not_embedded.inc
-- source include/have_blackhole.inc
+-- source include/have_log_bin.inc
--disable_warnings
drop table if exists t1,t2;
--- 1.46/mysql-test/t/mysqlbinlog.test 2007-03-31 17:18:02 +02:00
+++ 1.47/mysql-test/t/mysqlbinlog.test 2007-05-31 08:41:43 +02:00
@@ -1,5 +1,7 @@
# We are using .opt file since we need small binlog size
+-- source include/have_log_bin.inc
+
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
--- 1.30/mysql-test/r/mix_innodb_myisam_binlog.result 2006-11-28 13:26:08 +01:00
+++ 1.31/mysql-test/r/mix_innodb_myisam_binlog.result 2007-05-31 08:41:43 +02:00
@@ -11,7 +11,7 @@
master-bin.000001 98 Query 1 # use `test`; BEGIN
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(1)
master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 347 Xid 1 # COMMIT /* xid=8 */
+master-bin.000001 347 Xid 1 # COMMIT /* xid=9 */
delete from t1;
delete from t2;
reset master;
@@ -47,7 +47,7 @@
master-bin.000001 338 Query 1 # use `test`; insert into t1 values(4)
master-bin.000001 425 Query 1 # use `test`; insert into t2 select * from t1
master-bin.000001 519 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 616 Xid 1 # COMMIT /* xid=25 */
+master-bin.000001 616 Xid 1 # COMMIT /* xid=26 */
delete from t1;
delete from t2;
reset master;
@@ -74,7 +74,7 @@
master-bin.000001 425 Query 1 # use `test`; insert into t2 select * from t1
master-bin.000001 519 Query 1 # use `test`; rollback to savepoint my_savepoint
master-bin.000001 616 Query 1 # use `test`; insert into t1 values(7)
-master-bin.000001 703 Xid 1 # COMMIT /* xid=37 */
+master-bin.000001 703 Xid 1 # COMMIT /* xid=38 */
delete from t1;
delete from t2;
reset master;
@@ -101,7 +101,7 @@
show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 98 Query 1 # use `test`; insert into t1 values(9)
-master-bin.000001 185 Xid 1 # COMMIT /* xid=60 */
+master-bin.000001 185 Xid 1 # COMMIT /* xid=61 */
master-bin.000001 212 Query 1 # use `test`; insert into t2 select * from t1
delete from t1;
delete from t2;
@@ -112,18 +112,18 @@
show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 98 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 186 Xid 1 # COMMIT /* xid=66 */
+master-bin.000001 186 Xid 1 # COMMIT /* xid=67 */
master-bin.000001 213 Query 1 # use `test`; insert into t2 select * from t1
insert into t1 values(11);
commit;
show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 98 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 186 Xid 1 # COMMIT /* xid=66 */
+master-bin.000001 186 Xid 1 # COMMIT /* xid=67 */
master-bin.000001 213 Query 1 # use `test`; insert into t2 select * from t1
master-bin.000001 307 Query 1 # use `test`; BEGIN
master-bin.000001 375 Query 1 # use `test`; insert into t1 values(11)
-master-bin.000001 463 Xid 1 # COMMIT /* xid=68 */
+master-bin.000001 463 Xid 1 # COMMIT /* xid=69 */
alter table t2 engine=INNODB;
delete from t1;
delete from t2;
@@ -137,7 +137,7 @@
master-bin.000001 98 Query 1 # use `test`; BEGIN
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(12)
master-bin.000001 254 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 348 Xid 1 # COMMIT /* xid=78 */
+master-bin.000001 348 Xid 1 # COMMIT /* xid=79 */
delete from t1;
delete from t2;
reset master;
@@ -161,7 +161,7 @@
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 98 Query 1 # use `test`; BEGIN
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(14)
-master-bin.000001 254 Xid 1 # COMMIT /* xid=94 */
+master-bin.000001 254 Xid 1 # COMMIT /* xid=95 */
delete from t1;
delete from t2;
reset master;
@@ -182,7 +182,7 @@
master-bin.000001 98 Query 1 # use `test`; BEGIN
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(16)
master-bin.000001 254 Query 1 # use `test`; insert into t1 values(18)
-master-bin.000001 342 Xid 1 # COMMIT /* xid=105 */
+master-bin.000001 342 Xid 1 # COMMIT /* xid=106 */
delete from t1;
delete from t2;
alter table t2 type=MyISAM;
@@ -234,19 +234,19 @@
master-bin.000001 98 Query 1 # use `test`; BEGIN
master-bin.000001 166 Query 1 # use `test`; insert into t1 values(16)
master-bin.000001 254 Query 1 # use `test`; insert into t1 values(18)
-master-bin.000001 342 Xid 1 # COMMIT /* xid=105 */
+master-bin.000001 342 Xid 1 # COMMIT /* xid=106 */
master-bin.000001 369 Query 1 # use `test`; delete from t1
-master-bin.000001 446 Xid 1 # COMMIT /* xid=114 */
+master-bin.000001 446 Xid 1 # COMMIT /* xid=115 */
master-bin.000001 473 Query 1 # use `test`; delete from t2
-master-bin.000001 550 Xid 1 # COMMIT /* xid=115 */
+master-bin.000001 550 Xid 1 # COMMIT /* xid=116 */
master-bin.000001 577 Query 1 # use `test`; alter table t2 type=MyISAM
master-bin.000001 666 Query 1 # use `test`; insert into t1 values (1)
-master-bin.000001 754 Xid 1 # COMMIT /* xid=117 */
+master-bin.000001 754 Xid 1 # COMMIT /* xid=118 */
master-bin.000001 781 Query 1 # use `test`; insert into t2 values (20)
master-bin.000001 870 Query 1 # use `test`; drop table t1,t2
master-bin.000001 949 Query 1 # use `test`; create temporary table ti (a int) engine=innodb
master-bin.000001 1059 Query 1 # use `test`; insert into ti values(1)
-master-bin.000001 1146 Xid 1 # COMMIT /* xid=132 */
+master-bin.000001 1146 Xid 1 # COMMIT /* xid=133 */
master-bin.000001 1173 Query 1 # use `test`; create temporary table t1 (a int) engine=myisam
master-bin.000001 1283 Query 1 # use `test`; insert t1 values (1)
master-bin.000001 1366 Query 1 # use `test`; create table t0 (n int)
--- 1.8/mysql-test/t/drop_temp_table.test 2005-10-27 14:13:52 +02:00
+++ 1.9/mysql-test/t/drop_temp_table.test 2007-05-31 08:41:43 +02:00
@@ -1,5 +1,6 @@
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
+-- source include/have_log_bin.inc
--disable_warnings
drop database if exists `drop-temp+table-test`;
--- 1.25/mysql-test/t/mix_innodb_myisam_binlog.test 2007-01-18 18:05:03 +01:00
+++ 1.26/mysql-test/t/mix_innodb_myisam_binlog.test 2007-05-31 08:41:43 +02:00
@@ -4,7 +4,7 @@
# slave is always with --skip-innodb in the testsuite. I (Guilhem) however
# did some tests manually on a slave; tables are replicated fine and
# Exec_Master_Log_Pos advances as expected.
-
+-- source include/have_log_bin.inc
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
--- 1.9/mysql-test/t/mysqlbinlog2.test 2007-03-22 19:55:52 +01:00
+++ 1.10/mysql-test/t/mysqlbinlog2.test 2007-05-31 08:41:43 +02:00
@@ -1,6 +1,8 @@
# Test for the new options --start-datetime, stop-datetime,
# and a few others.
+-- source include/have_log_bin.inc
+
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
--- 1.4/mysql-test/t/ctype_cp932_binlog.test 2007-02-28 15:13:20 +01:00
+++ 1.5/mysql-test/t/ctype_cp932_binlog.test 2007-05-31 08:41:43 +02:00
@@ -1,5 +1,6 @@
-- source include/not_embedded.inc
-- source include/have_cp932.inc
+-- source include/have_log_bin.inc
--character_set cp932
--disable_warnings
--- 1.1/mysql-test/t/bdb_notembedded.test 2006-11-13 17:06:42 +01:00
+++ 1.2/mysql-test/t/bdb_notembedded.test 2007-05-31 08:41:43 +02:00
@@ -1,3 +1,4 @@
+-- source include/have_log_bin.inc
-- source include/not_embedded.inc
-- source include/have_bdb.inc
--- 1.1/mysql-test/t/flush_block_commit_notembedded.test 2006-11-13 17:06:42 +01:00
+++ 1.2/mysql-test/t/flush_block_commit_notembedded.test 2007-05-31 08:41:43 +02:00
@@ -3,6 +3,8 @@
# We verify that we did not introduce a deadlock.
# This is intended to mimick how mysqldump and innobackup work.
+-- source include/have_log_bin.inc
+
# And it requires InnoDB
-- source include/not_embedded.inc
-- source include/have_innodb.inc
--- 1.6/mysql-test/t/ctype_ucs_binlog.test 2006-01-24 08:30:47 +01:00
+++ 1.7/mysql-test/t/ctype_ucs_binlog.test 2007-05-31 08:41:43 +02:00
@@ -1,5 +1,6 @@
--source include/not_embedded.inc
--source include/have_ucs2.inc
+--source include/have_log_bin.inc
#
# Check correct binlogging of UCS2 user variables (BUG#3875)
--- 1.2/mysql-test/t/insert_select-binlog.test 2005-07-28 02:21:43 +02:00
+++ 1.3/mysql-test/t/insert_select-binlog.test 2007-05-31 08:41:43 +02:00
@@ -1,5 +1,6 @@
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
+-- source include/have_log_bin.inc
# Check if a partly-completed INSERT SELECT in a MyISAM table goes into the
# binlog
--- 1.4/mysql-test/t/user_var-binlog.test 2006-01-24 08:30:49 +01:00
+++ 1.5/mysql-test/t/user_var-binlog.test 2007-05-31 08:41:43 +02:00
@@ -1,5 +1,6 @@
# Embedded server does not support binlogging
--source include/not_embedded.inc
+--source include/have_log_bin.inc
# Check that user variables are binlogged correctly (BUG#3875)
create table t1 (a varchar(50));
--- 1.2/mysql-test/t/mysqlbinlog-cp932.test 2007-03-20 14:53:54 +01:00
+++ 1.3/mysql-test/t/mysqlbinlog-cp932.test 2007-05-31 08:41:43 +02:00
@@ -1,6 +1,7 @@
# disabled in embedded until tools running is fixed with embedded
---source include/not_embedded.inc
+-- source include/not_embedded.inc
-- source include/have_cp932.inc
+-- source include/have_log_bin.inc
# Bug#16217 (mysql client did not know how not switch its internal charset)
flush logs;
--- 1.55/mysql-test/t/mysqltest.test 2007-04-10 14:29:21 +02:00
+++ 1.56/mysql-test/t/mysqltest.test 2007-05-31 08:41:43 +02:00
@@ -1,3 +1,5 @@
+-- source include/have_log_bin.inc
+
# This test should work in embedded server after mysqltest is fixed
-- source include/not_embedded.inc
--- 1.1/mysql-test/t/ctype_cp932_notembedded.test 2006-02-24 17:34:10 +01:00
+++ 1.2/mysql-test/t/ctype_cp932_notembedded.test 2007-05-31 08:41:43 +02:00
@@ -1,5 +1,6 @@
-- source include/not_embedded.inc
-- source include/have_cp932.inc
+-- source include/have_log_bin.inc
--character_set cp932
--disable_warnings
--- 1.12/mysql-test/t/sp_trans.test 2007-03-24 18:19:58 +01:00
+++ 1.13/mysql-test/t/sp_trans.test 2007-05-31 08:41:43 +02:00
@@ -2,6 +2,7 @@
# tests that require InnoDB...
#
+-- source include/have_log_bin.inc
-- source include/have_innodb.inc
--disable_warnings
--- 1.7/mysql-test/t/binlog.test 2006-05-12 18:58:52 +02:00
+++ 1.8/mysql-test/t/binlog.test 2007-05-31 08:41:43 +02:00
@@ -1,6 +1,7 @@
#
# misc binlogging tests that do not require a slave running
#
+-- source include/have_log_bin.inc
-- source include/not_embedded.inc
-- source include/have_bdb.inc
-- source include/have_innodb.inc
| Thread |
|---|
| • bk commit into 5.0 tree (df:1.2489) | Daniel Fischer | 31 May |
