Commit 6dbc096f authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 

into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-clean
parents 17869528 5426f121

mysql-test/r/rpl_extraCol_myisam.result

+7 −7
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 0 type mismatch - received type 252, test.t3 has type 3

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -129,7 +129,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 0 type mismatch - received type 246, test.t4 has type 3

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -186,7 +186,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 5 type mismatch - received type 4, test.t5 has type 246

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -242,7 +242,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 3 type mismatch - received type 16, test.t6 has type 3

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -349,7 +349,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 2 type mismatch - received type 254, test.t10 has type 5

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -405,7 +405,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 2 type mismatch - received type 15, test.t11 has type 252

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -720,7 +720,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 0 type mismatch - received type 8, test.t17 has type 2

Skip_Counter	0

Exec_Master_Log_Pos	#

mysql-test/r/rpl_ndb_extraCol.result

+7 −7
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 0 type mismatch - received type 252, test.t3 has type 3

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -129,7 +129,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 0 type mismatch - received type 246, test.t4 has type 3

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -186,7 +186,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 5 type mismatch - received type 4, test.t5 has type 246

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -242,7 +242,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 3 type mismatch - received type 16, test.t6 has type 3

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -349,7 +349,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 2 type mismatch - received type 254, test.t10 has type 5

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -405,7 +405,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 2 type mismatch - received type 15, test.t11 has type 252

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -721,7 +721,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 0 type mismatch - received type 8, test.t17 has type 2

Skip_Counter	0

Exec_Master_Log_Pos	#

mysql-test/r/rpl_row_tabledefs_3innodb.result

+4 −4
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Table width mismatch - received 2 columns, test.t2 has 1 columns

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -197,7 +197,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 0 type mismatch - received type 3, test.t4 has type 4

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -235,7 +235,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 1 type mismatch - received type 3, test.t5 has type 4

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -273,7 +273,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1522

Last_Errno	1523

Last_Error	Column 2 type mismatch - received type 3, test.t6 has type 4

Skip_Counter	0

Exec_Master_Log_Pos	#

sql/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc 
               event_queue.cc event_db_repository.cc 

               sql_tablespace.cc events.cc ../sql-common/my_user.c 

               partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc

               rpl_rli.cc rpl_mi.cc

               rpl_rli.cc rpl_mi.cc sql_servers.cc

               ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc

  			   ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h

			   ${PROJECT_SOURCE_DIR}/include/mysqld_error.h