Commit 1e84e31c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents f6951675 14ad51e0

mysql-test/r/rpl_insert_id.result

+24 −0
Original line number Diff line number Diff line 
#

# Setup

#

stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

use test;

drop table if exists t1, t2, t3;

#

# See if queries that use both auto_increment and LAST_INSERT_ID()

# are replicated well

#

# We also check how the foreign_key_check variable is replicated

#

create table t1(a int auto_increment, key(a));

create table t2(b int auto_increment, c int, key(b));

insert into t1 values (1),(2),(3);
@@ -38,6 +49,9 @@ select * from t2; 
b	c

5	0

6	11

#

# check if INSERT SELECT in auto_increment is well replicated (bug #490)

#

drop table t2;

drop table t1;

create table t1(a int auto_increment, key(a));
@@ -68,11 +82,18 @@ b c 
9	13

drop table t1;

drop table t2;

#

# Bug#8412: Error codes reported in binary log for CHARACTER SET,

#           FOREIGN_KEY_CHECKS

#

SET TIMESTAMP=1000000000;

CREATE TABLE t1 ( a INT UNIQUE );

SET FOREIGN_KEY_CHECKS=0;

INSERT INTO t1 VALUES (1),(1);

ERROR 23000: Duplicate entry '1' for key 1

#

# Bug#14553: NULL in WHERE resets LAST_INSERT_ID

#

drop table t1;

create table t1(a int auto_increment, key(a));

create table t2(a int);
@@ -87,3 +108,6 @@ a 
1

drop table t1;

drop table t2;

#

# End of 4.1 tests

#

mysql-test/r/rpl_max_relay_size.result

+225 −18
Original line number Diff line number Diff line
@@ -5,9 +5,15 @@ reset slave; 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

stop slave;

#

# Generate a big enough master's binlog to cause relay log rotations

#

create table t1 (a int);

drop table t1;

reset slave;

#

# Test 1

#

set global max_binlog_size=8192;

set global max_relay_log_size=8192-1;

select @@global.max_relay_log_size;
@@ -15,47 +21,248 @@ select @@global.max_relay_log_size; 
4096

start slave;

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	50477	slave-relay-bin.000014	1221	master-bin.000001	Yes	Yes							0		0	50477	1221	None		0	No						#

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	50477

Relay_Log_File	slave-relay-bin.000014

Relay_Log_Pos	1221

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	50477

Relay_Log_Space	1221

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

#

# Test 2

#

stop slave;

reset slave;

set global max_relay_log_size=(5*4096);

select @@global.max_relay_log_size;

@@global.max_relay_log_size

20480

@@global.max_relay_log_size	20480

start slave;

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	50477	slave-relay-bin.000004	9457	master-bin.000001	Yes	Yes							0		0	50477	9457	None		0	No						#

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	50477

Relay_Log_File	slave-relay-bin.000004

Relay_Log_Pos	9457

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	50477

Relay_Log_Space	9457

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

#

# Test 3: max_relay_log_size = 0

#

stop slave;

reset slave;

set global max_relay_log_size=0;

select @@global.max_relay_log_size;

@@global.max_relay_log_size

0

@@global.max_relay_log_size	0

start slave;

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	50477	slave-relay-bin.000008	1283	master-bin.000001	Yes	Yes							0		0	50477	1283	None		0	No						#

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	50477

Relay_Log_File	slave-relay-bin.000008

Relay_Log_Pos	1283

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	50477

Relay_Log_Space	1283

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

#

# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions

#

stop slave;

reset slave;

flush logs;

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_PORT	1		4	slave-relay-bin.000001	4		No	No							0		0	0	4	None		0	No						#

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	

Read_Master_Log_Pos	4

Relay_Log_File	slave-relay-bin.000001

Relay_Log_Pos	4

Relay_Master_Log_File	

Slave_IO_Running	No

Slave_SQL_Running	No

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	0

Relay_Log_Space	4

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

#

# Test 5

#

reset slave;

start slave;

flush logs;

create table t1 (a int);

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	50535	slave-relay-bin.000009	62	master-bin.000001	Yes	Yes							0		0	50535	62	None		0	No						#

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	50535

Relay_Log_File	slave-relay-bin.000009

Relay_Log_Pos	62

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	50535

Relay_Log_Space	62

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

#

# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated

#

flush logs;

drop table t1;

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	50583	slave-relay-bin.000010	52	master-bin.000001	Yes	Yes							0		0	50583	52	None		0	No						#

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	50583

Relay_Log_File	slave-relay-bin.000010

Relay_Log_Pos	52

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	50583

Relay_Log_Space	52

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

flush logs;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000002	4		
File	master-bin.000002

Position	4

Binlog_Do_DB	

Binlog_Ignore_DB

mysql-test/t/rpl_insert_id.test

+31 −13
Original line number Diff line number Diff line 
# See if queries that use both auto_increment and LAST_INSERT_ID()

# are replicated well



# We also check how the foreign_key_check variable is replicated

--echo #

--echo # Setup

--echo #



source include/master-slave.inc;

source include/have_innodb.inc;

use test;

--disable_warnings

drop table if exists t1, t2, t3;

--enable_warnings



--echo #

--echo # See if queries that use both auto_increment and LAST_INSERT_ID()

--echo # are replicated well

--echo #

--echo # We also check how the foreign_key_check variable is replicated

--echo #



connection master;

create table t1(a int auto_increment, key(a));

create table t2(b int auto_increment, c int, key(b));
@@ -39,7 +50,9 @@ select * from t1; 
select * from t2;

connection master;



# check if INSERT SELECT in auto_increment is well replicated (bug #490)

--echo #

--echo # check if INSERT SELECT in auto_increment is well replicated (bug #490)

--echo #



drop table t2;

drop table t1;
@@ -62,10 +75,11 @@ save_master_pos; 
connection slave;

sync_with_master;



#

# Bug#8412: Error codes reported in binary log for CHARACTER SET,

#           FOREIGN_KEY_CHECKS

#

--echo #

--echo # Bug#8412: Error codes reported in binary log for CHARACTER SET,

--echo #           FOREIGN_KEY_CHECKS

--echo #



connection master;

SET TIMESTAMP=1000000000;

CREATE TABLE t1 ( a INT UNIQUE );
@@ -74,9 +88,10 @@ SET FOREIGN_KEY_CHECKS=0; 
INSERT INTO t1 VALUES (1),(1);

sync_slave_with_master;

 

#

# Bug#14553: NULL in WHERE resets LAST_INSERT_ID

#

--echo #

--echo # Bug#14553: NULL in WHERE resets LAST_INSERT_ID

--echo #



connection master;

drop table t1;

create table t1(a int auto_increment, key(a));
@@ -92,4 +107,7 @@ connection master; 
drop table t1;

drop table t2;

sync_slave_with_master;

# End of 4.1 tests
 


--echo #

--echo # End of 4.1 tests

--echo #

mysql-test/t/rpl_max_relay_size.test

+38 −3
Original line number Diff line number Diff line
@@ -7,7 +7,11 @@ source include/master-slave.inc; 
connection slave;

stop slave;

connection master;

# Generate a big enough master's binlog to cause relay log rotations



--echo #

--echo # Generate a big enough master's binlog to cause relay log rotations

--echo #



create table t1 (a int);

let $1=800;

disable_query_log;
@@ -23,6 +27,11 @@ drop table t1; 
save_master_pos;

connection slave;

reset slave;



--echo #

--echo # Test 1

--echo #



set global max_binlog_size=8192;

set global max_relay_log_size=8192-1; # mapped to 4096

select @@global.max_relay_log_size;
@@ -30,7 +39,13 @@ start slave; 
sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 33 #

--vertical_results

show slave status;



--echo #

--echo # Test 2

--echo #



stop slave;

reset slave;

set global max_relay_log_size=(5*4096);
@@ -39,7 +54,13 @@ start slave; 
sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 33 #

--vertical_results

show slave status;



--echo #

--echo # Test 3: max_relay_log_size = 0

--echo #



stop slave;

reset slave;

set global max_relay_log_size=0;
@@ -48,9 +69,12 @@ start slave; 
sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 33 #

--vertical_results

show slave status;



# Tests below are mainly to ensure that we have not coded with wrong assumptions

--echo #

--echo # Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions

--echo #



stop slave;

reset slave;
@@ -59,8 +83,13 @@ reset slave; 
flush logs;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 33 #

--vertical_results

show slave status;



--echo #

--echo # Test 5

--echo #



reset slave;

start slave;

sync_with_master;
@@ -75,8 +104,13 @@ connection slave; 
sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 33 #

--vertical_results

show slave status;

# one more rotation, to be sure Relay_Log_Space is correctly updated



--echo #

--echo # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated

--echo #



flush logs;

connection master;

drop table t1;
@@ -85,6 +119,7 @@ connection slave; 
sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 33 #

--vertical_results

show slave status;



connection master;

sql/sql_yacc.yy

+3 −1
Original line number Diff line number Diff line
@@ -4803,6 +4803,7 @@ load: LOAD DATA_SYM load_data_lock opt_local INFILE TEXT_STRING_sys 
	LOAD TABLE_SYM table_ident FROM MASTER_SYM

        {

	  Lex->sql_command = SQLCOM_LOAD_MASTER_TABLE;

	  WARN_DEPRECATED("LOAD TABLE FROM MASTER", "mysqldump or future BACKUP/RESTORE DATABASE facility");

	  if (!Select->add_table_to_list(YYTHD, $3, NULL, TL_OPTION_UPDATING))

	    YYABORT;
@@ -4811,6 +4812,7 @@ load: LOAD DATA_SYM load_data_lock opt_local INFILE TEXT_STRING_sys 
	LOAD DATA_SYM FROM MASTER_SYM

        {

	  Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;

	  WARN_DEPRECATED("LOAD DATA FROM MASTER", "mysqldump or future BACKUP/RESTORE DATABASE facility");

        };



opt_local: