MySQL Lists: commits: bk commit into 5.1 tree (tomas:1.2542)

List:	Commits	« Previous Message Next Message »
From:	tomas	Date:	February 20 2008 2:10pm
Subject:	bk commit into 5.1 tree (tomas:1.2542)
View as plain text
Below is the list of changes that have just been committed into a local
5.1 repository of tomas.  When tomas 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-02-20 14:10:24+01:00, tomas@stripped +4 -0
  corrected merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@stripped, 2008-02-20 14:10:21+01:00,
tomas@stripped +1911 -1901
    corrected merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@stripped, 2008-02-20 14:10:21+01:00,
tomas@stripped +1911 -1901
    corrected merge

  mysql-test/suite/rpl/r/rpl_heartbeat.result@stripped, 2008-02-20 14:10:21+01:00,
tomas@stripped +4 -4
    corrected merge

  mysql-test/suite/rpl/r/rpl_skip_error.result@stripped, 2008-02-20 14:10:21+01:00,
tomas@stripped +1 -0
    corrected merge

diff -Nrup a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result	2008-02-13 15:42:35 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result	2008-02-20 14:10:21 +01:00
@@ -133,6 +133,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 
 ***** Testing Altering table def scenario *****
@@ -507,6 +508,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 ****************************************
 * columns in master at middle of table *
@@ -581,6 +583,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 5, test.t10 has type 254
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -656,6 +659,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 252, test.t11 has type 15
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -807,6 +811,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1091
 Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default
database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -893,6 +898,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1054
 Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'.
Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -979,6 +985,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1072
 Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database:
'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -1272,6 +1279,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 
 ***** Testing Altering table def scenario *****
@@ -1646,6 +1654,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 ****************************************
 * columns in master at middle of table *
@@ -1720,6 +1729,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 5, test.t10 has type 254
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -1795,6 +1805,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 252, test.t11 has type 15
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -1946,6 +1957,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1091
 Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default
database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -2032,6 +2044,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1054
 Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'.
Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -2118,6 +2131,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1072
 Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database:
'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -2411,6 +2425,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 
 ***** Testing Altering table def scenario *****
@@ -2785,6 +2800,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 ****************************************
 * columns in master at middle of table *
@@ -2859,6 +2875,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 5, test.t10 has type 254
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -2934,6 +2951,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 252, test.t11 has type 15
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -3085,6 +3103,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1091
 Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default
database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -3171,6 +3190,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1054
 Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'.
Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -3257,6 +3277,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1072
 Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database:
'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
diff -Nrup a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result	2008-02-13 15:42:35 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result	2008-02-20 14:10:21 +01:00
@@ -133,6 +133,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 
 ***** Testing Altering table def scenario *****
@@ -507,6 +508,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 ****************************************
 * columns in master at middle of table *
@@ -581,6 +583,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 5, test.t10 has type 254
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -656,6 +659,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 252, test.t11 has type 15
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -807,6 +811,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1091
 Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default
database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -893,6 +898,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1054
 Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'.
Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -979,6 +985,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1072
 Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database:
'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -1272,6 +1279,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 
 ***** Testing Altering table def scenario *****
@@ -1646,6 +1654,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 ****************************************
 * columns in master at middle of table *
@@ -1720,6 +1729,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 5, test.t10 has type 254
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -1795,6 +1805,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 252, test.t11 has type 15
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -1946,6 +1957,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1091
 Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default
database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -2032,6 +2044,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1054
 Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'.
Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -2118,6 +2131,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1072
 Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database:
'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -2411,6 +2425,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 
 ***** Testing Altering table def scenario *****
@@ -2785,6 +2800,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 
 ****************************************
 * columns in master at middle of table *
@@ -2859,6 +2875,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 5, test.t10 has type 254
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -2934,6 +2951,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type
mismatch - received type 252, test.t11 has type 15
+Master_Bind	0.0.0.0
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 
@@ -3085,6 +3103,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1091
 Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default
database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -3171,6 +3190,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1054
 Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'.
Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
@@ -3257,6 +3277,7 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1072
 Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database:
'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind	0.0.0.0
 STOP SLAVE;
 RESET SLAVE;
 
diff -Nrup a/mysql-test/suite/rpl/r/rpl_heartbeat.result
b/mysql-test/suite/rpl/r/rpl_heartbeat.result
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2007-12-12 22:30:59 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2008-02-20 14:10:21 +01:00
@@ -11,13 +11,13 @@ Variable_name	Slave_heartbeat_period
 Value	5.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root',
master_heartbeat_period= 0.0009999;
 Warnings:
-Warning	1609	The requested value for the heartbeat period  is less than 1 msec.  The
period is reset to zero which means no heartbeats will be sending
+Warning	1612	The requested value for the heartbeat period  is less than 1 msec.  The
period is reset to zero which means no heartbeats will be sending
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	0.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root',
master_heartbeat_period= 4294967;
 Warnings:
-Warning	1609	The requested value for the heartbeat period  exceeds the value of
`slave_net_timeout' sec.  A sensible value for the period should be less than the
timeout.
+Warning	1612	The requested value for the heartbeat period  exceeds the value of
`slave_net_timeout' sec.  A sensible value for the period should be less than the
timeout.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	4294967.000
@@ -29,7 +29,7 @@ reset slave;
 set @@global.slave_net_timeout= 5;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root',
master_heartbeat_period= 5.001;
 Warnings:
-Warning	1609	The requested value for the heartbeat period  exceeds the value of
`slave_net_timeout' sec.  A sensible value for the period should be less than the
timeout.
+Warning	1612	The requested value for the heartbeat period  exceeds the value of
`slave_net_timeout' sec.  A sensible value for the period should be less than the
timeout.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	5.001
@@ -41,7 +41,7 @@ Variable_name	Slave_heartbeat_period
 Value	4.000
 set @@global.slave_net_timeout= 3 /* must be a warning */;
 Warnings:
-Warning	1609	The currect value for master_heartbeat_period exceeds the new value of
`slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
+Warning	1612	The currect value for master_heartbeat_period exceeds the new value of
`slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
 reset slave;
 drop table if exists t1;
 set @@global.slave_net_timeout= 10;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_skip_error.result
b/mysql-test/suite/rpl/r/rpl_skip_error.result
--- a/mysql-test/suite/rpl/r/rpl_skip_error.result	2008-02-13 14:56:01 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_skip_error.result	2008-02-20 14:10:21 +01:00
@@ -68,4 +68,5 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Master_Bind	0.0.0.0
 drop table t1;
Thread
• bk commit into 5.1 tree (tomas:1.2542)	tomas	20 Feb