bk commit into 6.0 tree (acurtis:1.2621)

[antony]

Below is the list of changes that have just been committed into a local
6.0 repository of antony. When antony 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-10-04 23:56:37-07:00, acurtis@stripped +4 -0
  post merge fixes - change in error message number

  mysql-test/suite/ndb/r/ndb_alter_table_online2.result@stripped, 2007-10-04 23:56:18-07:00, acurtis@stripped +2 -2
    post merge fixes - change in error message number

  mysql-test/suite/ndb/r/ndb_blob.result@stripped, 2007-10-04 23:56:19-07:00, acurtis@stripped +2 -2
    post merge fixes - change in error message number

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@stripped, 2007-10-04 23:56:19-07:00, acurtis@stripped +1 -1
    post merge fixes - change in error message number

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@stripped, 2007-10-04 23:56:19-07:00, acurtis@stripped +4 -4
    post merge fixes - change in error message number

diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_online2.result b/mysql-test/suite/ndb/r/ndb_alter_table_online2.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online2.result	2007-09-14 04:17:08 -07:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online2.result	2007-10-04 23:56:18 -07:00
@@ -4,10 +4,10 @@ create table t1 (pk int key, a int) engi
 insert into t1 values (1,0);
 alter table t1 add b int;
 Warnings:
-Warning	1476	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 update t1 set b= 0;
 alter table t1 add c int;
 Warnings:
-Warning	1476	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 update t1 set c= 0;
 drop table t1;
diff -Nrup a/mysql-test/suite/ndb/r/ndb_blob.result b/mysql-test/suite/ndb/r/ndb_blob.result
--- a/mysql-test/suite/ndb/r/ndb_blob.result	2007-09-11 10:44:00 -07:00
+++ b/mysql-test/suite/ndb/r/ndb_blob.result	2007-10-04 23:56:19 -07:00
@@ -343,7 +343,7 @@ a	b	c	d
 9	b9	999	dd9
 alter table t1 add x int;
 Warnings:
-Warning	1476	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 select * from t1 order by a;
 a	b	c	d	x
 1	b1	111	dd1	NULL
@@ -394,7 +394,7 @@ a	b	c	d
 9	b9	999	dd9
 alter table t1 add x int;
 Warnings:
-Warning	1476	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning	1477	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 select * from t1 order by a;
 a	b	c	d	x
 1	b1	111	dd1	NULL
diff -Nrup a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2007-09-13 09:34:17 -07:00
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2007-10-04 23:56:19 -07:00
@@ -122,7 +122,7 @@ Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	945470
-Relay_Log_File	slave-relay-bin.000003
+Relay_Log_File	slave-relay-bin.000002
 Relay_Log_Pos	945616
 Relay_Master_Log_File	master-bin.000001
 Slave_IO_Running	Yes
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result	2007-09-14 02:20:43 -07:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result	2007-10-04 23:56:19 -07:00
@@ -562,7 +562,7 @@ Replicate_Do_Table	
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1533
+Last_Errno	1534
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -580,7 +580,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1533
+Last_SQL_Errno	1534
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -637,7 +637,7 @@ Replicate_Do_Table	
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1533
+Last_Errno	1534
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -655,7 +655,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1533
+Last_SQL_Errno	1534
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;