bk commit into 5.0 tree (msvensson:1.2506) BUG#28369

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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 15:58:34+02:00, msvensson@pilot.(none) +27 -0
  Bug#28369 rpl test cases fail with binlog disabled
   - Turn on binlog only for tests that need is
   - Skip those tests if --skip-binlog is used

  BitKeeper/deleted/.del-ctype_cp932_notembedded.result@stripped, 2007-06-07 15:55:50+02:00,
msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ctype_cp932_notembedded.result ->
BitKeeper/deleted/.del-ctype_cp932_notembedded.result

  BitKeeper/deleted/.del-ctype_cp932_notembedded.test@stripped, 2007-06-07 15:55:49+02:00,
msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ctype_cp932_notembedded.test ->
BitKeeper/deleted/.del-ctype_cp932_notembedded.test

  mysql-test/include/have_binlog.inc@stripped, 2007-06-07 15:58:33+02:00,
msvensson@pilot.(none) +4 -0
    New BitKeeper file ``mysql-test/include/have_binlog.inc''

  mysql-test/include/have_binlog.inc@stripped, 2007-06-07 15:58:33+02:00,
msvensson@pilot.(none) +0 -0

  mysql-test/include/master-slave.inc@stripped, 2007-06-07 15:58:32+02:00,
msvensson@pilot.(none) +3 -0
    Need binlog

  mysql-test/lib/mtr_cases.pl@stripped, 2007-06-07 15:58:32+02:00, msvensson@pilot.(none) +17
-0
    Turn on binlog only for tests that need it
    Skip those tests if --skip-binlog is used

  mysql-test/r/have_binlog.require@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none)
+2 -0
    New BitKeeper file ``mysql-test/r/have_binlog.require''

  mysql-test/r/have_binlog.require@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none)
+0 -0

  mysql-test/r/sp_trans.result@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +0
-20
    Moved to "sp_binlog"

  mysql-test/r/sp_trans_log.result@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none)
+20 -0
    New BitKeeper file ``mysql-test/r/sp_trans_log.result''

  mysql-test/r/sp_trans_log.result@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none)
+0 -0

  mysql-test/t/binlog.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/blackhole.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +1
-0
    Need binlog

  mysql-test/t/ctype_cp932_binlog.test@stripped, 2007-06-07 15:58:33+02:00,
msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/ctype_ucs_binlog.test@stripped, 2007-06-07 15:58:33+02:00,
msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/drop_temp_table.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none)
+2 -2
    Need binlog

  mysql-test/t/flush_block_commit_notembedded.test@stripped, 2007-06-07 15:58:33+02:00,
msvensson@pilot.(none) +1 -1
    Need binlog

  mysql-test/t/innodb.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/insert_select-binlog.test@stripped, 2007-06-07 15:58:33+02:00,
msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/mix_innodb_myisam_binlog.test@stripped, 2007-06-07 15:58:33+02:00,
msvensson@pilot.(none) +1 -3
    Need binlog

  mysql-test/t/mysqlbinlog-cp932.test@stripped, 2007-06-07 15:58:33+02:00,
msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/mysqlbinlog.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +1
-2
    Need binlog

  mysql-test/t/mysqlbinlog2.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none)
+1 -2
    Need binlog

  mysql-test/t/mysqldump.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +1
-0
    Need binlog

  mysql-test/t/rpl000015.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +2
-0
    Need binlog

  mysql-test/t/rpl000017.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +2
-0
    Need binlog

  mysql-test/t/rpl_rotate_logs.test@stripped, 2007-06-07 15:58:33+02:00,
msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/t/sp_trans.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +0
-28
    Moved to "sp_binlog"

  mysql-test/t/sp_trans_log.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none)
+33 -0
    New BitKeeper file ``mysql-test/t/sp_trans_log.test''

  mysql-test/t/sp_trans_log.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none) +0
-0

  mysql-test/t/user_var-binlog.test@stripped, 2007-06-07 15:58:33+02:00, msvensson@pilot.(none)
+1 -2
    Need 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:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/bug28369/my50-bug28369

--- 1.9/mysql-test/t/blackhole.test	2007-02-14 17:35:53 +01:00
+++ 1.10/mysql-test/t/blackhole.test	2007-06-07 15:58:33 +02:00
@@ -4,6 +4,7 @@
 #
 -- source include/not_embedded.inc
 -- source include/have_blackhole.inc
+-- source include/have_binlog.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-06-07 15:58:33 +02:00
@@ -1,7 +1,6 @@
 # We are using .opt file since we need small binlog size
 
-# 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/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-06-07 15:58:33 +02:00
@@ -1,5 +1,5 @@
-# Embedded server doesn't support binlog
--- source include/not_embedded.inc
+--source include/have_binlog.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-06-07 15:58:33 +02:00
@@ -5,9 +5,7 @@
 # did some tests manually on a slave; tables are replicated fine and
 # Exec_Master_Log_Pos advances as expected.
 
-# Embedded server doesn't support binlogging
--- source include/not_embedded.inc
-
+-- source include/have_binlog.inc
 -- source include/have_innodb.inc
 
 --disable_warnings

--- 1.9/mysql-test/t/mysqlbinlog2.test	2007-03-22 19:55:52 +01:00
+++ 1.10/mysql-test/t/mysqlbinlog2.test	2007-06-07 15:58:33 +02:00
@@ -1,8 +1,7 @@
 # Test for the new options --start-datetime, stop-datetime,
 # and a few others.
 
-# Embedded server doesn't support binlogging
--- source include/not_embedded.inc
+-- source include/have_binlog.inc
 
 --disable_warnings
 drop table if exists t1;

--- 1.5/mysql-test/t/ctype_cp932_binlog.test	2007-05-24 12:35:42 +02:00
+++ 1.6/mysql-test/t/ctype_cp932_binlog.test	2007-06-07 15:58:33 +02:00
@@ -1,5 +1,6 @@
 -- source include/not_embedded.inc
 -- source include/have_cp932.inc
+-- source include/have_binlog.inc
 
 --character_set cp932
 --disable_warnings

--- 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-06-07 15:58:33 +02:00
@@ -4,7 +4,7 @@
 # This is intended to mimick how mysqldump and innobackup work.
 
 # And it requires InnoDB
--- source include/not_embedded.inc
+-- source include/have_binlog.inc
 -- source include/have_innodb.inc
 
 connect (con1,localhost,root,,);

--- 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-06-07 15:58:33 +02:00
@@ -1,5 +1,6 @@
 --source include/not_embedded.inc
 --source include/have_ucs2.inc
+--source include/have_binlog.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-06-07 15:58:33 +02:00
@@ -1,5 +1,6 @@
 # Embedded server doesn't support binlog
 -- source include/not_embedded.inc
+-- source include/have_binlog.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-06-07 15:58:33 +02:00
@@ -1,5 +1,4 @@
-# Embedded server does not support binlogging
---source include/not_embedded.inc
+-- source include/have_binlog.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-06-07 15:58:33 +02:00
@@ -1,6 +1,7 @@
 # disabled in embedded until tools running is fixed with embedded
 --source include/not_embedded.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.38/mysql-test/lib/mtr_cases.pl	2007-04-18 16:49:07 +02:00
+++ 1.39/mysql-test/lib/mtr_cases.pl	2007-06-07 15:58:32 +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");
+    }
+
   }
 }
 
@@ -608,6 +624,7 @@ our @tags=
  ["include/have_binlog_format_row.inc", "binlog_format", "row"],
  ["include/have_binlog_format_statement.inc", "binlog_format", "stmt"],
  ["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"],
+ ["include/have_binlog.inc", "need_binlog", 1],
  ["include/big_test.inc", "big_test", 1],
  ["include/have_debug.inc", "need_debug", 1],
  ["include/have_ndb.inc", "ndb_test", 1],

--- 1.140/mysql-test/t/innodb.test	2007-04-19 03:36:16 +02:00
+++ 1.141/mysql-test/t/innodb.test	2007-06-07 15:58:33 +02:00
@@ -12,6 +12,7 @@
 #######################################################################
 
 -- source include/have_innodb.inc
+-- source include/have_binlog.inc
 
 #
 # Small basic test with ignore
--- New file ---
+++ mysql-test/include/have_binlog.inc	07/06/07 15:58:33
-- require r/have_binlog.require
disable_query_log;
show variables like "log_bin";
enable_query_log;

--- New file ---
+++ mysql-test/r/have_binlog.require	07/06/07 15:58:33
Variable_name	Value
log_bin	ON

--- New file ---
+++ mysql-test/r/sp_trans_log.result	07/06/07 15:58:33
CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|
CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|
insert into t2 values (1,1)|
create function bug23333() 
RETURNS int(11)
DETERMINISTIC
begin
insert into t1 values (null);
select count(*) from t1 into @a;
return @a;
end|
reset master|
insert into t2 values (bug23333(),1)|
ERROR 23000: Duplicate entry '1' for key 1
show binlog events from 98 /* with fixes for #23333 will show there is the query */|
Log_name	Pos	Event_type	Server_id	End_log_pos	Info
select count(*),@a from t1 /* must be 1,1 */|
count(*)	@a
1	1
drop table t1, t2|

--- New file ---
+++ mysql-test/t/sp_trans_log.test	07/06/07 15:58:33
-- source include/have_innodb.inc
-- source include/have_binlog.inc

delimiter |;

#
# Bug #13270 INSERT,UPDATE,etc that calls func with side-effect does not binlog
# Bug #23333 stored function + non-transac table + transac table =
#            breaks stmt-based binlog
# Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()
#
CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|
CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|

insert into t2 values (1,1)|

create function bug23333() 
RETURNS int(11)
DETERMINISTIC
begin
  insert into t1 values (null);
  select count(*) from t1 into @a;
  return @a;
end|

reset master|
--error ER_DUP_ENTRY
insert into t2 values (bug23333(),1)| 
--replace_column 2 # 5 # 6 #
show binlog events from 98 /* with fixes for #23333 will show there is the query */|
select count(*),@a from t1 /* must be 1,1 */|
drop table t1, t2|



--- 1.115/mysql-test/t/mysqldump.test	2007-04-30 11:30:04 +02:00
+++ 1.116/mysql-test/t/mysqldump.test	2007-06-07 15:58:33 +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.13/mysql-test/include/master-slave.inc	2006-10-03 16:07:15 +02:00
+++ 1.14/mysql-test/include/master-slave.inc	2007-06-07 15:58:32 +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.35/mysql-test/t/rpl000015.test	2006-12-19 15:31:08 +01:00
+++ 1.36/mysql-test/t/rpl000015.test	2007-06-07 15:58:33 +02:00
@@ -1,3 +1,5 @@
+-- source include/have_binlog.inc
+
 connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
 connection master;

--- 1.68/mysql-test/t/rpl_rotate_logs.test	2007-05-21 11:33:57 +02:00
+++ 1.69/mysql-test/t/rpl_rotate_logs.test	2007-06-07 15:58:33 +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.15/mysql-test/t/rpl000017.test	2006-12-19 15:31:08 +01:00
+++ 1.16/mysql-test/t/rpl000017.test	2007-06-07 15:58:33 +02:00
@@ -1,3 +1,5 @@
+-- source include/have_binlog.inc
+
 connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
 connection master;

--- 1.13/mysql-test/r/sp_trans.result	2007-05-18 17:48:39 +02:00
+++ 1.14/mysql-test/r/sp_trans.result	2007-06-07 15:58:33 +02:00
@@ -530,23 +530,3 @@ count(*)
 drop table t3, t4|
 drop procedure bug14210|
 set @@session.max_heap_table_size=default|
-CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|
-CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|
-insert into t2 values (1,1)|
-create function bug23333() 
-RETURNS int(11)
-DETERMINISTIC
-begin
-insert into t1 values (null);
-select count(*) from t1 into @a;
-return @a;
-end|
-reset master|
-insert into t2 values (bug23333(),1)|
-ERROR 23000: Duplicate entry '1' for key 1
-show binlog events from 98 /* with fixes for #23333 will show there is the query */|
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-select count(*),@a from t1 /* must be 1,1 */|
-count(*)	@a
-1	1
-drop table t1, t2|

--- 1.13/mysql-test/t/sp_trans.test	2007-05-18 17:48:40 +02:00
+++ 1.14/mysql-test/t/sp_trans.test	2007-06-07 15:58:33 +02:00
@@ -554,34 +554,6 @@ set @@session.max_heap_table_size=defaul
 
 
 #
-# Bug #13270 INSERT,UPDATE,etc that calls func with side-effect does not binlog
-# Bug #23333 stored function + non-transac table + transac table =
-#            breaks stmt-based binlog
-# Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()
-#
-CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|
-CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|
-
-insert into t2 values (1,1)|
-
-create function bug23333() 
-RETURNS int(11)
-DETERMINISTIC
-begin
-  insert into t1 values (null);
-  select count(*) from t1 into @a;
-  return @a;
-end|
-
-reset master|
---error ER_DUP_ENTRY
-insert into t2 values (bug23333(),1)| 
---replace_column 2 # 5 # 6 #
-show binlog events from 98 /* with fixes for #23333 will show there is the query */|
-select count(*),@a from t1 /* must be 1,1 */|
-drop table t1, t2|
-
-#
 # BUG#NNNN: New bug synopsis
 #
 #--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-06-07 15:58:33 +02:00
@@ -4,6 +4,7 @@
 -- source include/not_embedded.inc
 -- source include/have_bdb.inc
 -- source include/have_innodb.inc
+-- source include/have_binlog.inc
 
 --disable_warnings
 drop table if exists t1, t2;