MySQL Lists: commits: bk commit into 5.1 tree (msvensson:1.2485)

List:	Commits	« Previous Message Next Message »
From:	msvensson	Date:	March 1 2007 12:52pm
Subject:	bk commit into 5.1 tree (msvensson:1.2485)
View as plain text
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-03-01 12:52:19+01:00, msvensson@stripped +37 -0
  Make sure tests drops objects created and restore variables to default  

  mysql-test/extra/rpl_tests/rpl_row_func003.test@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -1
    Fix spelling error

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +4 -0
    Restore sql_mode after test

  mysql-test/r/events_logs_tests.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Turn even_scheduleroff before test ends

  mysql-test/r/events_scheduling.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Turn even_scheduleroff before test ends

  mysql-test/r/insert.result@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped +1
-0
    Drop tables t1 before test ends

  mysql-test/r/rpl_read_only.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Set read_only flag back to default

  mysql-test/r/rpl_row_NOW.result@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped
+1 -0
    Drop database mysqltest1 before test ends 

  mysql-test/r/rpl_row_USER.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +2 -0
    Drop users created by test

  mysql-test/r/rpl_row_basic_11bugs.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +2 -0
    Drop table and set query_cache_size back to default

  mysql-test/r/rpl_row_func002.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Drop table created by test

  mysql-test/r/rpl_row_sp008.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Drop table created by test

  mysql-test/r/rpl_row_sp012.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Drop user created by test

  mysql-test/r/rpl_row_tabledefs_2myisam.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +2 -0
    Restore sql_mode

  mysql-test/r/rpl_row_tabledefs_3innodb.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +2 -0
    Restore sql_mode

  mysql-test/r/rpl_row_tabledefs_7ndb.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +2 -0
    Restore sql_mode

  mysql-test/r/rpl_row_view01.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Drop database created by test

  mysql-test/r/rpl_slave_status.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Remove created users

  mysql-test/r/rpl_switch_stm_row_mixed.result@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +2 -0
    Reset binlog_format to default

  mysql-test/r/sp.result@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped +1 -0
    Drop procedure created by test

  mysql-test/r/varbinary.result@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped
+1 -0
    Drop table created by test

  mysql-test/r/variables.result@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped
+4 -4
    Reset changed variables to their defaults

  mysql-test/t/events_logs_tests.test@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +2 -0
    Turn off event_scheduler before test ends

  mysql-test/t/events_scheduling.test@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Turn off event_scheduler

  mysql-test/t/insert.test@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped +2 -0
    Drop table created by test

  mysql-test/t/rpl_read_only.test@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped
+2 -0
    Reset read_only flag

  mysql-test/t/rpl_row_NOW.test@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped
+1 -0
    Drop db created by test

  mysql-test/t/rpl_row_USER.test@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped
+3 -1
    Drop users created

  mysql-test/t/rpl_row_basic_11bugs.test@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +6 -0
    Drop tables created by test

  mysql-test/t/rpl_row_func002.test@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Drop table created by test

  mysql-test/t/rpl_row_sp008.test@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped
+1 -0
    Drop table created by test

  mysql-test/t/rpl_row_sp012.test@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped
+1 -0
    Drop user created by test

  mysql-test/t/rpl_row_view01.test@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Drop db created by test

  mysql-test/t/rpl_slave_status.test@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +1 -0
    Remove users created by test

  mysql-test/t/rpl_switch_stm_row_mixed.test@stripped, 2007-03-01 12:52:17+01:00,
msvensson@stripped +8 -0
    Reset binlog_format

  mysql-test/t/sp.test@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped +1 -0
    Drop procedure created by test

  mysql-test/t/varbinary.test@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped +1
-0
    Drop tables created by test

  mysql-test/t/variables.test@stripped, 2007-03-01 12:52:17+01:00, msvensson@stripped +4
-4
    Restore variables to their default before test ends

# 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.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-maint

--- 1.7/mysql-test/r/events_scheduling.result	2006-09-01 13:08:37 +02:00
+++ 1.8/mysql-test/r/events_scheduling.result	2007-03-01 12:52:17 +01:00
@@ -83,3 +83,4 @@ DROP TABLE table_2;
 DROP TABLE table_3;
 DROP TABLE table_4;
 DROP DATABASE events_test;
+SET GLOBAL event_scheduler=OFF;

--- 1.15/mysql-test/r/events_logs_tests.result	2007-01-03 14:09:24 +01:00
+++ 1.16/mysql-test/r/events_logs_tests.result	2007-03-01 12:52:17 +01:00
@@ -97,3 +97,4 @@ DROP TABLE slow_event_test;
 SET GLOBAL  long_query_time =@old_global_long_query_time;
 SET SESSION long_query_time =@old_session_long_query_time;
 DROP DATABASE events_test;
+SET GLOBAL event_scheduler=off;

--- 1.9/mysql-test/t/events_scheduling.test	2006-09-01 13:08:37 +02:00
+++ 1.10/mysql-test/t/events_scheduling.test	2007-03-01 12:52:17 +01:00
@@ -63,3 +63,4 @@ DROP TABLE table_2;
 DROP TABLE table_3;
 DROP TABLE table_4;
 DROP DATABASE events_test;
+SET GLOBAL event_scheduler=OFF;

--- 1.15/mysql-test/t/events_logs_tests.test	2007-01-03 14:09:24 +01:00
+++ 1.16/mysql-test/t/events_logs_tests.test	2007-03-01 12:52:17 +01:00
@@ -104,3 +104,5 @@ SET GLOBAL  long_query_time =@old_global
 SET SESSION long_query_time =@old_session_long_query_time; 
 
 DROP DATABASE events_test;
+
+SET GLOBAL event_scheduler=off;

--- 1.16/mysql-test/r/rpl_switch_stm_row_mixed.result	2007-01-08 23:52:19 +01:00
+++ 1.17/mysql-test/r/rpl_switch_stm_row_mixed.result	2007-03-01 12:52:17 +01:00
@@ -7,6 +7,7 @@ start slave;
 drop database if exists mysqltest1;
 create database mysqltest1;
 use mysqltest1;
+set @my_binlog_format= @@global.binlog_format;
 set session binlog_format=row;
 set global binlog_format=row;
 show global variables like "binlog_format%";
@@ -1003,3 +1004,4 @@ master-bin.000001	#	Query	1	#	use `mysql
 master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t12)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 drop database mysqltest1;
+set global binlog_format =@my_binlog_format;

--- 1.14/mysql-test/t/rpl_switch_stm_row_mixed.test	2007-02-20 18:47:45 +01:00
+++ 1.15/mysql-test/t/rpl_switch_stm_row_mixed.test	2007-03-01 12:52:17 +01:00
@@ -8,6 +8,10 @@ create database mysqltest1;
 --enable_warnings
 use mysqltest1;
 
+# Save binlog format
+set @my_binlog_format= @@global.binlog_format;
+
+# Set binlog format to row
 set session binlog_format=row;
 set global binlog_format=row;
 
@@ -542,3 +546,7 @@ diff_files $MYSQLTEST_VARDIR/tmp/rpl_swi
 
 drop database mysqltest1;
 sync_slave_with_master;
+
+connection master;
+# Restore binlog format setting
+set global binlog_format =@my_binlog_format;

--- 1.3/mysql-test/extra/rpl_tests/rpl_row_func003.test	2007-02-20 18:47:45 +01:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_row_func003.test	2007-03-01 12:52:17 +01:00
@@ -80,7 +80,7 @@ SET AUTOCOMMIT=1;
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info
test > $MYSQLTEST_VARDIR/tmp/func003_master.sql
 --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert
--no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_slave.sql
 
-# First lets cleanupi
+# First lets cleanup
 DROP FUNCTION test.f1;
 DROP TABLE test.t1;
 

--- 1.6/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2006-12-05 10:45:58 +01:00
+++ 1.7/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2007-03-01 12:52:17 +01:00
@@ -12,6 +12,7 @@ DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t9;
 --enable_warnings
 sync_slave_with_master;
 STOP SLAVE;
+SET @my_sql_mode= @@global.sql_mode;
 SET GLOBAL SQL_MODE='STRICT_ALL_TABLES';
 START SLAVE;
 
@@ -238,3 +239,6 @@ DROP TABLE IF EXISTS t1_int,t1_bit,t1_ch
 DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t7,t8,t9;
 --enable_warnings
 sync_slave_with_master;
+
+# Restore sql_mode
+SET @@global.sql_mode= @my_sql_mode;

--- 1.1/mysql-test/r/rpl_row_NOW.result	2005-12-22 06:34:52 +01:00
+++ 1.2/mysql-test/r/rpl_row_NOW.result	2007-03-01 12:52:17 +01:00
@@ -26,3 +26,4 @@ END|
 INSERT INTO mysqltest1.t1 SET n = NULL, a = now();
 DROP TABLE IF EXISTS mysqltest1.t1;
 DROP FUNCTION mysqltest1.f1;
+DROP DATABASE mysqltest1;

--- 1.3/mysql-test/r/rpl_row_USER.result	2007-02-28 20:33:57 +01:00
+++ 1.4/mysql-test/r/rpl_row_USER.result	2007-03-01 12:52:17 +01:00
@@ -34,3 +34,5 @@ a	users
 DROP DATABASE mysqltest1;
 REVOKE ALL ON mysqltest1.* FROM 'tester'@'%';
 REVOKE ALL ON mysqltest1.* FROM ''@'localhost%';
+DROP USER tester@'%';
+DROP USER ''@'localhost%';

--- 1.1/mysql-test/r/rpl_row_func002.result	2005-12-22 06:34:53 +01:00
+++ 1.2/mysql-test/r/rpl_row_func002.result	2007-03-01 12:52:17 +01:00
@@ -23,3 +23,4 @@ SET TIMESTAMP=333300000;
 INSERT INTO test.t2 VALUES (null,f1(),CURRENT_TIMESTAMP);
 DROP FUNCTION test.f1;
 DROP TABLE test.t1;
+DROP TABLE test.t;

--- 1.4/mysql-test/r/rpl_row_sp008.result	2006-03-03 09:49:38 +01:00
+++ 1.5/mysql-test/r/rpl_row_sp008.result	2007-03-01 12:52:17 +01:00
@@ -31,3 +31,4 @@ a
 2
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t1;
+DROP TABLE IF EXISTS test.t2;

--- 1.1/mysql-test/r/rpl_row_sp012.result	2005-12-22 06:34:56 +01:00
+++ 1.2/mysql-test/r/rpl_row_sp012.result	2007-03-01 12:52:17 +01:00
@@ -56,3 +56,4 @@ DROP PROCEDURE IF EXISTS test.p3;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
+DROP USER user1@localhost;

--- 1.8/mysql-test/r/rpl_row_tabledefs_2myisam.result	2007-01-12 12:24:31 +01:00
+++ 1.9/mysql-test/r/rpl_row_tabledefs_2myisam.result	2007-03-01 12:52:17 +01:00
@@ -5,6 +5,7 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 STOP SLAVE;
+SET @my_sql_mode= @@global.sql_mode;
 SET GLOBAL SQL_MODE='STRICT_ALL_TABLES';
 START SLAVE;
 CREATE TABLE t1_int (a INT PRIMARY KEY, b INT) ENGINE='MyISAM';
@@ -379,3 +380,4 @@ a	b	x
 **** Cleanup ****
 DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;
 DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t7,t8,t9;
+SET @@global.sql_mode= @my_sql_mode;

--- 1.2/mysql-test/r/rpl_row_view01.result	2006-02-08 21:48:36 +01:00
+++ 1.3/mysql-test/r/rpl_row_view01.result	2007-03-01 12:52:17 +01:00
@@ -98,3 +98,4 @@ DROP TABLE IF EXISTS mysqltest1.t3;
 DROP TABLE IF EXISTS mysqltest1.t1;
 DROP TABLE IF EXISTS mysqltest1.t2;
 DROP TABLE IF EXISTS mysqltest1.t4;
+DROP DATABASE mysqltest1;

--- 1.3/mysql-test/t/rpl_row_NOW.test	2007-02-20 18:47:45 +01:00
+++ 1.4/mysql-test/t/rpl_row_NOW.test	2007-03-01 12:52:17 +01:00
@@ -56,6 +56,7 @@ connection master;
 # lets cleanup
 DROP TABLE IF EXISTS mysqltest1.t1;
 DROP FUNCTION mysqltest1.f1;
+DROP DATABASE mysqltest1;
 
 # Lets compare. Note: If they match test will pass, if they do not match
 # the test will show that the diff statement failed and not reject file

--- 1.2/mysql-test/t/rpl_row_USER.test	2006-01-17 12:58:51 +01:00
+++ 1.3/mysql-test/t/rpl_row_USER.test	2007-03-01 12:52:17 +01:00
@@ -2,7 +2,7 @@
 # Original Author: JBM                                                      #
 # Original Date: Aug/18/2005                                                #
 #############################################################################
-# TEST: To test the UUID() in rbr                                           #
+# TEST: To test the USER() and CURRENT_USER() in rbr                        #
 #############################################################################
 # Change Author: JBM
 # Change Date: 2006-01-16
@@ -52,6 +52,8 @@ connection master;
 DROP DATABASE mysqltest1;
 REVOKE ALL ON mysqltest1.* FROM 'tester'@'%';
 REVOKE ALL ON mysqltest1.* FROM ''@'localhost%';
+DROP USER tester@'%';
+DROP USER ''@'localhost%';
 
 sync_slave_with_master;
 

--- 1.4/mysql-test/t/rpl_row_func002.test	2007-02-20 18:47:45 +01:00
+++ 1.5/mysql-test/t/rpl_row_func002.test	2007-03-01 12:52:17 +01:00
@@ -90,6 +90,7 @@ connection master;
 # Cleanup
 DROP FUNCTION test.f1;
 DROP TABLE test.t1;
+DROP TABLE test.t2;
 sync_slave_with_master;
 
 # the test will show that the diff statement failed and no reject file

--- 1.4/mysql-test/t/rpl_row_sp008.test	2006-02-24 16:31:32 +01:00
+++ 1.5/mysql-test/t/rpl_row_sp008.test	2007-03-01 12:52:17 +01:00
@@ -51,6 +51,7 @@ SELECT * FROM test.t2;
 connection master;
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t1;
+DROP TABLE IF EXISTS test.t2;
 sync_slave_with_master;
 
 # End of 5.0 test case

--- 1.2/mysql-test/t/rpl_row_sp012.test	2006-02-13 19:02:32 +01:00
+++ 1.3/mysql-test/t/rpl_row_sp012.test	2007-03-01 12:52:17 +01:00
@@ -68,6 +68,7 @@ DROP PROCEDURE IF EXISTS test.p3;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
+DROP USER user1@localhost;
 sync_slave_with_master;
 
 # End of 5.0 test case

--- 1.2/mysql-test/t/rpl_row_view01.test	2006-02-08 21:48:27 +01:00
+++ 1.3/mysql-test/t/rpl_row_view01.test	2007-03-01 12:52:17 +01:00
@@ -82,6 +82,7 @@ DROP TABLE IF EXISTS mysqltest1.t3;
 DROP TABLE IF EXISTS mysqltest1.t1;
 DROP TABLE IF EXISTS mysqltest1.t2;
 DROP TABLE IF EXISTS mysqltest1.t4;
+DROP DATABASE mysqltest1;
 sync_slave_with_master;
 
 # End of 5.1 test case

--- 1.2/mysql-test/r/rpl_read_only.result	2007-02-28 20:33:57 +01:00
+++ 1.3/mysql-test/r/rpl_read_only.result	2007-03-01 12:52:17 +01:00
@@ -113,3 +113,4 @@ ERROR HY000: The MySQL server is running
 drop user test;
 drop table t1;
 drop table t2;
+set global read_only=0;

--- 1.2/mysql-test/t/rpl_read_only.test	2007-02-28 20:33:57 +01:00
+++ 1.3/mysql-test/t/rpl_read_only.test	2007-03-01 12:52:17 +01:00
@@ -108,4 +108,6 @@ drop user test;
 drop table t1;
 drop table t2;
 sync_slave_with_master;
+set global read_only=0;
+
 

--- 1.12/mysql-test/r/rpl_row_basic_11bugs.result	2006-11-21 21:32:50 +01:00
+++ 1.13/mysql-test/r/rpl_row_basic_11bugs.result	2007-03-01 12:52:17 +01:00
@@ -97,6 +97,7 @@ a
 7
 8
 9
+SET GLOBAL QUERY_CACHE_SIZE=0;
 ================ Test for BUG#22550 ================
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 reset master;
@@ -118,3 +119,4 @@ HEX(a)	b
 SELECT HEX(a),b FROM t1;
 HEX(a)	b
 0	2
+DROP TABLE t1;

--- 1.5/mysql-test/r/rpl_row_tabledefs_3innodb.result	2007-01-12 12:24:31 +01:00
+++ 1.6/mysql-test/r/rpl_row_tabledefs_3innodb.result	2007-03-01 12:52:17 +01:00
@@ -5,6 +5,7 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 STOP SLAVE;
+SET @my_sql_mode= @@global.sql_mode;
 SET GLOBAL SQL_MODE='STRICT_ALL_TABLES';
 START SLAVE;
 CREATE TABLE t1_int (a INT PRIMARY KEY, b INT) ENGINE='InnoDB';
@@ -379,3 +380,4 @@ a	b	x
 **** Cleanup ****
 DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;
 DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t7,t8,t9;
+SET @@global.sql_mode= @my_sql_mode;

--- 1.1/mysql-test/r/rpl_row_tabledefs_7ndb.result	2006-05-08 20:05:07 +02:00
+++ 1.2/mysql-test/r/rpl_row_tabledefs_7ndb.result	2007-03-01 12:52:17 +01:00
@@ -5,6 +5,7 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 STOP SLAVE;
+SET @my_sql_mode= @@global.sql_mode;
 SET GLOBAL SQL_MODE='STRICT_ALL_TABLES';
 START SLAVE;
 CREATE TABLE t1_int (a INT PRIMARY KEY, b INT) ENGINE='NDB';
@@ -284,3 +285,4 @@ SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;
 DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t9;
+SET @@global.sql_mode= @my_sql_mode;

--- 1.11/mysql-test/t/rpl_row_basic_11bugs.test	2006-12-07 15:18:27 +01:00
+++ 1.12/mysql-test/t/rpl_row_basic_11bugs.test	2007-03-01 12:52:17 +01:00
@@ -92,6 +92,8 @@ INSERT INTO t1 VALUES (7),(8),(9);
 sync_slave_with_master;
 SELECT * FROM t1;
 
+SET GLOBAL QUERY_CACHE_SIZE=0;
+
 # Bug#22550: Replication of BIT columns failing
 --echo ================ Test for BUG#22550 ================
 --disable_query_log
@@ -113,3 +115,7 @@ UPDATE t1 SET a=0 WHERE b=2;
 SELECT HEX(a),b FROM t1;
 sync_slave_with_master;
 SELECT HEX(a),b FROM t1;
+
+connection master;
+DROP TABLE t1;
+sync_slave_with_master;

--- 1.31/mysql-test/r/insert.result	2007-01-23 11:34:32 +01:00
+++ 1.32/mysql-test/r/insert.result	2007-03-01 12:52:17 +01:00
@@ -383,3 +383,4 @@ id	data
 7	130
 8	140
 9	150
+drop table t1;

--- 1.19/mysql-test/r/varbinary.result	2006-11-29 23:48:36 +01:00
+++ 1.20/mysql-test/r/varbinary.result	2007-03-01 12:52:17 +01:00
@@ -78,3 +78,4 @@ alter table t1 modify a varchar(255);
 select length(a) from t1;
 length(a)
 6
+drop table t1;

--- 1.95/mysql-test/r/variables.result	2007-02-20 16:26:29 +01:00
+++ 1.96/mysql-test/r/variables.result	2007-03-01 12:52:17 +01:00
@@ -9,12 +9,11 @@ set @my_key_buffer_size           =@@glo
 set @my_max_binlog_cache_size     =@@global.max_binlog_cache_size;
 set @my_max_binlog_size           =@@global.max_binlog_size;
 set @my_max_connect_errors        =@@global.max_connect_errors;
+set @my_max_connections           =@@global.max_connections;
 set @my_max_delayed_threads       =@@global.max_delayed_threads;
 set @my_max_heap_table_size       =@@global.max_heap_table_size;
 set @my_max_insert_delayed_threads=@@global.max_insert_delayed_threads;
 set @my_max_join_size             =@@global.max_join_size;
-set @my_max_user_connections      =@@global.max_user_connections;
-set @my_max_write_lock_count      =@@global.max_write_lock_count;
 set @my_myisam_data_pointer_size  =@@global.myisam_data_pointer_size;
 set @my_net_buffer_length         =@@global.net_buffer_length;
 set @my_net_write_timeout         =@@global.net_write_timeout;
@@ -922,12 +921,13 @@ set global key_buffer_size           =@m
 set global max_binlog_cache_size     =default;
 set global max_binlog_size           =@my_max_binlog_size;
 set global max_connect_errors        =@my_max_connect_errors;
+set global max_connections           =@my_max_connections;
 set global max_delayed_threads       =@my_max_delayed_threads;
 set global max_heap_table_size       =@my_max_heap_table_size;
 set global max_insert_delayed_threads=@my_max_insert_delayed_threads;
 set global max_join_size             =@my_max_join_size;
-set global max_user_connections      =@my_max_user_connections;
-set global max_write_lock_count      =@my_max_write_lock_count;
+set global max_user_connections      =default;
+set global max_write_lock_count      =default;
 set global myisam_data_pointer_size  =@my_myisam_data_pointer_size;
 set global net_buffer_length         =@my_net_buffer_length;
 set global net_write_timeout         =@my_net_write_timeout;

--- 1.28/mysql-test/t/insert.test	2007-01-23 11:34:33 +01:00
+++ 1.29/mysql-test/t/insert.test	2007-03-01 12:52:17 +01:00
@@ -248,3 +248,5 @@ insert ignore into t1 values(NULL,100),(
 insert ignore into t1
values(NULL,10),(NULL,20),(NULL,110),(NULL,120),(NULL,100),(NULL,90);
 insert ignore into t1
values(NULL,130),(NULL,140),(500,110),(550,120),(450,100),(NULL,150);
 select * from t1 order by id;
+
+drop table t1;

--- 1.12/mysql-test/t/varbinary.test	2006-12-22 00:38:31 +01:00
+++ 1.13/mysql-test/t/varbinary.test	2007-03-01 12:52:17 +01:00
@@ -83,4 +83,5 @@ insert into t1 values("aaa   ");
 select length(a) from t1;
 alter table t1 modify a varchar(255);
 select length(a) from t1;
+drop table t1;
 

--- 1.67/mysql-test/t/variables.test	2007-02-20 16:25:07 +01:00
+++ 1.68/mysql-test/t/variables.test	2007-03-01 12:52:17 +01:00
@@ -18,12 +18,11 @@ set @my_key_buffer_size           =@@glo
 set @my_max_binlog_cache_size     =@@global.max_binlog_cache_size;
 set @my_max_binlog_size           =@@global.max_binlog_size;
 set @my_max_connect_errors        =@@global.max_connect_errors;
+set @my_max_connections           =@@global.max_connections;
 set @my_max_delayed_threads       =@@global.max_delayed_threads;
 set @my_max_heap_table_size       =@@global.max_heap_table_size;
 set @my_max_insert_delayed_threads=@@global.max_insert_delayed_threads;
 set @my_max_join_size             =@@global.max_join_size;
-set @my_max_user_connections      =@@global.max_user_connections;
-set @my_max_write_lock_count      =@@global.max_write_lock_count;
 set @my_myisam_data_pointer_size  =@@global.myisam_data_pointer_size;
 set @my_net_buffer_length         =@@global.net_buffer_length;
 set @my_net_write_timeout         =@@global.net_write_timeout;
@@ -718,12 +717,13 @@ set global key_buffer_size           =@m
 set global max_binlog_cache_size     =default;                #@my_max_binlog_cache_size;
 set global max_binlog_size           =@my_max_binlog_size;
 set global max_connect_errors        =@my_max_connect_errors;
+set global max_connections           =@my_max_connections;
 set global max_delayed_threads       =@my_max_delayed_threads;
 set global max_heap_table_size       =@my_max_heap_table_size;
 set global max_insert_delayed_threads=@my_max_insert_delayed_threads;
 set global max_join_size             =@my_max_join_size;
-set global max_user_connections      =@my_max_user_connections;
-set global max_write_lock_count      =@my_max_write_lock_count;
+set global max_user_connections      =default;
+set global max_write_lock_count      =default;
 set global myisam_data_pointer_size  =@my_myisam_data_pointer_size;
 set global net_buffer_length         =@my_net_buffer_length;
 set global net_write_timeout         =@my_net_write_timeout;

--- 1.250/mysql-test/r/sp.result	2007-02-20 21:21:51 +01:00
+++ 1.251/mysql-test/r/sp.result	2007-03-01 12:52:17 +01:00
@@ -5801,6 +5801,7 @@ bug23760_rc_test(ROW_COUNT())
 DROP TABLE bug23760, bug23760_log|
 DROP PROCEDURE bug23760_update_log|
 DROP PROCEDURE bug23760_test_row_count|
+DROP PROCEDURE bug23760_test_row_count2|
 DROP FUNCTION bug23760_rc_test|
 DROP PROCEDURE IF EXISTS bug24117|
 DROP TABLE IF EXISTS t3|

--- 1.218/mysql-test/t/sp.test	2007-02-20 21:21:52 +01:00
+++ 1.219/mysql-test/t/sp.test	2007-03-01 12:52:17 +01:00
@@ -6755,6 +6755,7 @@ SELECT bug23760_rc_test(ROW_COUNT())|
 DROP TABLE bug23760, bug23760_log|
 DROP PROCEDURE bug23760_update_log|
 DROP PROCEDURE bug23760_test_row_count|
+DROP PROCEDURE bug23760_test_row_count2|
 DROP FUNCTION bug23760_rc_test|
 
 #

--- 1.8/mysql-test/r/rpl_slave_status.result	2006-05-17 15:05:35 +02:00
+++ 1.9/mysql-test/r/rpl_slave_status.result	2007-03-01 12:52:17 +01:00
@@ -53,4 +53,5 @@ Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	NULL
 drop table t1;
+delete from mysql.user where user='rpl';
 drop table t1;

--- 1.9/mysql-test/t/rpl_slave_status.test	2006-10-08 15:57:12 +02:00
+++ 1.10/mysql-test/t/rpl_slave_status.test	2007-03-01 12:52:17 +01:00
@@ -49,6 +49,7 @@ show slave status;
 # Cleanup (Note that slave IO thread is not running)
 connection slave;
 drop table t1;
+delete from mysql.user where user='rpl';
 connection master;
 drop table t1;
Thread
• bk commit into 5.1 tree (msvensson:1.2485)	msvensson	1 Mar