Commit 350ad500 authored by unknown's avatar unknown
Browse files

Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 

into mysql.com:/home/mysql_src/mysql-4.1-874
parents 5304a03e 43489240

mysql-test/r/mysqlbinlog.result

+5 −1
Original line number Diff line number Diff line 
drop table if exists t1,t2;

set timestamp=1000000000;

drop table if exists t1,t2;

create table t1 (word varchar(20));

create table t2 (id int auto_increment not null primary key);

insert into t1 values ("abirvalg");
@@ -17,6 +17,8 @@ flush logs; 
/*!40019 SET @@session.max_insert_delayed_threads=0*/;

use test;

SET TIMESTAMP=1000000000;

drop table if exists t1,t2;

SET TIMESTAMP=1000000000;

create table t1 (word varchar(20));

SET TIMESTAMP=1000000000;

create table t2 (id int auto_increment not null primary key);
@@ -51,6 +53,8 @@ insert into t1 values ("Alas"); 
/*!40019 SET @@session.max_insert_delayed_threads=0*/;

use test;

SET TIMESTAMP=1000000000;

drop table if exists t1,t2;

SET TIMESTAMP=1000000000;

create table t1 (word varchar(20));

SET TIMESTAMP=1000000000;

create table t2 (id int auto_increment not null primary key);

mysql-test/r/rpl_charset.result

+56 −54
Original line number Diff line number Diff line
@@ -105,60 +105,62 @@ drop database test2; 
drop database test3;

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	79	Query	1	79	use `test`; create database test2 character set latin2

master-bin.000001	156	Query	1	156	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=30

master-bin.000001	290	Query	1	290	use `test`; create database test3

master-bin.000001	346	Query	1	346	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64

master-bin.000001	480	Query	1	480	use `test`; drop database test3

master-bin.000001	534	Query	1	534	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64

master-bin.000001	668	Query	1	668	use `test`; create database test3

master-bin.000001	724	Query	1	724	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	859	Query	1	859	use `test2`; create table t1 (a int auto_increment primary key, b varchar(100))

master-bin.000001	961	Query	1	961	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	1097	Intvar	1	1097	INSERT_ID=1

master-bin.000001	1125	Query	1	1125	use `test2`; insert into t1 (b) values(@@character_set_server)

master-bin.000001	1210	Query	1	1210	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	1346	Intvar	1	1346	INSERT_ID=2

master-bin.000001	1374	Query	1	1374	use `test2`; insert into t1 (b) values(@@collation_server)

master-bin.000001	1455	Query	1	1455	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	1591	Intvar	1	1591	INSERT_ID=3

master-bin.000001	1619	Query	1	1619	use `test2`; insert into t1 (b) values(@@character_set_client)

master-bin.000001	1704	Query	1	1704	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	1840	Intvar	1	1840	INSERT_ID=4

master-bin.000001	1868	Query	1	1868	use `test2`; insert into t1 (b) values(@@character_set_connection)

master-bin.000001	1957	Query	1	1957	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	2093	Intvar	1	2093	INSERT_ID=5

master-bin.000001	2121	Query	1	2121	use `test2`; insert into t1 (b) values(@@collation_connection)

master-bin.000001	2206	Query	1	2206	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	2341	Query	1	2341	use `test2`; truncate table t1

master-bin.000001	2394	Query	1	2394	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	2529	Intvar	1	2529	INSERT_ID=1

master-bin.000001	2557	Query	1	2557	use `test2`; insert into t1 (b) values(@@collation_connection)

master-bin.000001	2642	Query	1	2642	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	2777	Intvar	1	2777	INSERT_ID=2

master-bin.000001	2805	Query	1	2805	use `test2`; insert into t1 (b) values(LEAST("Müller","Muffler"))

master-bin.000001	2893	Query	1	2893	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	3029	Intvar	1	3029	INSERT_ID=3

master-bin.000001	3057	Query	1	3057	use `test2`; insert into t1 (b) values(@@collation_connection)

master-bin.000001	3142	Query	1	3142	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	3278	Intvar	1	3278	INSERT_ID=4

master-bin.000001	3306	Query	1	3306	use `test2`; insert into t1 (b) values(LEAST("Müller","Muffler"))

master-bin.000001	3394	Query	1	3394	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	3530	Intvar	1	3530	INSERT_ID=74

master-bin.000001	3558	Create_file	1	3558	db=test2;table=t1;file_id=1;block_len=581

master-bin.000001	4226	Query	1	4226	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	4362	Intvar	1	4362	INSERT_ID=5

master-bin.000001	4390	Exec_load	1	4390	;file_id=1

master-bin.000001	4413	Query	1	4413	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	4549	Query	1	4549	use `test2`; truncate table t1

master-bin.000001	4602	Query	1	4602	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	4738	Intvar	1	4738	INSERT_ID=1

master-bin.000001	4766	User var	1	4766	@`a`=_cp850 0x4DFC6C6C6572 COLLATE cp850_general_ci

master-bin.000001	4806	Query	1	4806	use `test2`; insert into t1 (b) values(collation(@a))

master-bin.000001	4882	Query	1	4882	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	5018	Query	1	5018	use `test2`; drop database test2

master-bin.000001	5073	Query	1	5073	SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	5204	Query	1	5204	drop database test3

master-bin.000001	79	Query	1	79	use `test`; drop database if exists test2

master-bin.000001	143	Query	1	143	use `test`; drop database if exists test3

master-bin.000001	207	Query	1	207	use `test`; create database test2 character set latin2

master-bin.000001	284	Query	1	284	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=30

master-bin.000001	418	Query	1	418	use `test`; create database test3

master-bin.000001	474	Query	1	474	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64

master-bin.000001	608	Query	1	608	use `test`; drop database test3

master-bin.000001	662	Query	1	662	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64

master-bin.000001	796	Query	1	796	use `test`; create database test3

master-bin.000001	852	Query	1	852	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	987	Query	1	987	use `test2`; create table t1 (a int auto_increment primary key, b varchar(100))

master-bin.000001	1089	Query	1	1089	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	1225	Intvar	1	1225	INSERT_ID=1

master-bin.000001	1253	Query	1	1253	use `test2`; insert into t1 (b) values(@@character_set_server)

master-bin.000001	1338	Query	1	1338	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	1474	Intvar	1	1474	INSERT_ID=2

master-bin.000001	1502	Query	1	1502	use `test2`; insert into t1 (b) values(@@collation_server)

master-bin.000001	1583	Query	1	1583	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	1719	Intvar	1	1719	INSERT_ID=3

master-bin.000001	1747	Query	1	1747	use `test2`; insert into t1 (b) values(@@character_set_client)

master-bin.000001	1832	Query	1	1832	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	1968	Intvar	1	1968	INSERT_ID=4

master-bin.000001	1996	Query	1	1996	use `test2`; insert into t1 (b) values(@@character_set_connection)

master-bin.000001	2085	Query	1	2085	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	2221	Intvar	1	2221	INSERT_ID=5

master-bin.000001	2249	Query	1	2249	use `test2`; insert into t1 (b) values(@@collation_connection)

master-bin.000001	2334	Query	1	2334	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	2469	Query	1	2469	use `test2`; truncate table t1

master-bin.000001	2522	Query	1	2522	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	2657	Intvar	1	2657	INSERT_ID=1

master-bin.000001	2685	Query	1	2685	use `test2`; insert into t1 (b) values(@@collation_connection)

master-bin.000001	2770	Query	1	2770	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	2905	Intvar	1	2905	INSERT_ID=2

master-bin.000001	2933	Query	1	2933	use `test2`; insert into t1 (b) values(LEAST("Müller","Muffler"))

master-bin.000001	3021	Query	1	3021	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	3157	Intvar	1	3157	INSERT_ID=3

master-bin.000001	3185	Query	1	3185	use `test2`; insert into t1 (b) values(@@collation_connection)

master-bin.000001	3270	Query	1	3270	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	3406	Intvar	1	3406	INSERT_ID=4

master-bin.000001	3434	Query	1	3434	use `test2`; insert into t1 (b) values(LEAST("Müller","Muffler"))

master-bin.000001	3522	Query	1	3522	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	3658	Intvar	1	3658	INSERT_ID=74

master-bin.000001	3686	Create_file	1	3686	db=test2;table=t1;file_id=1;block_len=581

master-bin.000001	4354	Query	1	4354	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	4490	Intvar	1	4490	INSERT_ID=5

master-bin.000001	4518	Exec_load	1	4518	;file_id=1

master-bin.000001	4541	Query	1	4541	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	4677	Query	1	4677	use `test2`; truncate table t1

master-bin.000001	4730	Query	1	4730	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	4866	Intvar	1	4866	INSERT_ID=1

master-bin.000001	4894	User var	1	4894	@`a`=_cp850 0x4DFC6C6C6572 COLLATE cp850_general_ci

master-bin.000001	4934	Query	1	4934	use `test2`; insert into t1 (b) values(collation(@a))

master-bin.000001	5010	Query	1	5010	use `test2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	5146	Query	1	5146	use `test2`; drop database test2

master-bin.000001	5201	Query	1	5201	SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	5332	Query	1	5332	drop database test3

set global character_set_server=latin2;

ERROR HY000: Binary logging and replication forbid changing the global server character set or collation

set global character_set_server=latin2;

mysql-test/r/rpl_delete_all.result

0 → 100644
+31 −0
Original line number Diff line number Diff line 
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;

create database test1;

drop database if exists test1;

Warnings:

Note	1008	Can't drop database 'test1'; database doesn't exist

show tables from test1;

ERROR HY000: Can't read dir of './test1/' (Errcode: 2)

create table t1 (a int);

drop table if exists t1;

Warnings:

Note	1051	Unknown table 't1'

select * from t1;

ERROR 42S02: Table 'test.t1' doesn't exist

create table t1 (a int);

insert into t1 values(1);

delete from t1;

select * from t1;

a

insert into t1 values(1);

insert into t1 values(2);

update t1 set a=2;

select * from t1;

a

2

2

drop table t1;

mysql-test/r/rpl_flush_log_loop.result

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ start 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	SLAVE_PORT	60	slave-bin.000001	79	relay-log.000002	4	slave-bin.000001	Yes	Yes							0		0	79	4	None		0	No						#
 
#	127.0.0.1	root	SLAVE_PORT	60	slave-bin.000001	161	relay-log.000002	4	slave-bin.000001	Yes	Yes							0		0	161	4	None		0	No						#

mysql-test/r/rpl_replicate_do.result

+1 −1
Original line number Diff line number Diff line
@@ -28,4 +28,4 @@ ERROR 42S02: Table 'test.t11' doesn't exist 
drop table if exists t1,t2,t11;

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	1281	slave-relay-bin.000002	1325	master-bin.000001	Yes	Yes			test.t1				0		0	1281	1325	None		0	No						#
 
#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	1340	slave-relay-bin.000002	1384	master-bin.000001	Yes	Yes			test.t1				0		0	1340	1384	None		0	No						#