Commit 72d56253 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/bkroot/mysql-4.1 

into mysql.com:/space/bk/b6391-mysql-4.1


sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents 5fc09be9 220acb32

mysql-test/r/drop_temp_table.result

+4 −4
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ get_lock("a",10) 
show binlog events;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3

master-bin.000001	79	Query	1	79	use `test`; create database `drop-temp+table-test`

master-bin.000001	152	Query	1	152	use `drop-temp+table-test`; create temporary table `table:name` (a int)

master-bin.000001	246	Query	1	246	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`

master-bin.000001	375	Query	1	375	use `drop-temp+table-test`; DO RELEASE_LOCK("a")

master-bin.000001	79	Query	1	79	create database `drop-temp+table-test`

master-bin.000001	168	Query	1	168	use `drop-temp+table-test`; create temporary table `table:name` (a int)

master-bin.000001	262	Query	1	262	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`

master-bin.000001	391	Query	1	391	use `drop-temp+table-test`; DO RELEASE_LOCK("a")

drop database `drop-temp+table-test`;

mysql-test/r/rpl_charset.result

+58 −58
Original line number Diff line number Diff line
@@ -105,62 +105,62 @@ drop database mysqltest2; 
drop database mysqltest3;

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`; drop database if exists mysqltest2

master-bin.000001	148	Query	1	148	use `test`; drop database if exists mysqltest3

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

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

master-bin.000001	433	Query	1	433	use `test`; create database mysqltest3

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

master-bin.000001	628	Query	1	628	use `test`; drop database mysqltest3

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

master-bin.000001	821	Query	1	821	use `test`; create database mysqltest3

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

master-bin.000001	2564	Query	1	2564	use `mysqltest2`; truncate table t1

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

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

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

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

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

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

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

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

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

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

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

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

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

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

master-bin.000001	3831	Create_file	1	3831	db=mysqltest2;table=t1;file_id=1;block_len=581

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

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

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

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

master-bin.000001	4837	Query	1	4837	use `mysqltest2`; truncate table t1

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

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

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

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

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

master-bin.000001	5326	Query	1	5326	use `mysqltest2`; drop database mysqltest2

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

master-bin.000001	5522	Query	1	5522	drop database mysqltest3

master-bin.000001	79	Query	1	79	drop database if exists mysqltest2

master-bin.000001	154	Query	1	154	drop database if exists mysqltest3

master-bin.000001	229	Query	1	229	create database mysqltest2 character set latin2

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

master-bin.000001	451	Query	1	451	create database mysqltest3

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

master-bin.000001	652	Query	1	652	drop database mysqltest3

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

master-bin.000001	851	Query	1	851	create database mysqltest3

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

master-bin.000001	2600	Query	1	2600	use `mysqltest2`; truncate table t1

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

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

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

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

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

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

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

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

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

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

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

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

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

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

master-bin.000001	3867	Create_file	1	3867	db=mysqltest2;table=t1;file_id=1;block_len=581

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

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

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

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

master-bin.000001	4873	Query	1	4873	use `mysqltest2`; truncate table t1

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

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

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

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

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

master-bin.000001	5362	Query	1	5362	drop database mysqltest2

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

master-bin.000001	5558	Query	1	5558	drop database mysqltest3

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;
@@ -200,8 +200,8 @@ hex(c1) hex(c2) 
CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3

stop slave;

delete from t1;

change master to master_log_pos=5801;

start slave until master_log_file='master-bin.000001', master_log_pos=5937;

change master to master_log_pos=5847;

start slave until master_log_file='master-bin.000001', master_log_pos=5983;

start slave;

select hex(c1), hex(c2) from t1;

hex(c1)	hex(c2)

mysql-test/r/rpl_create_database.result

0 → 100644
+83 −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;

DROP DATABASE IF EXISTS mysqltest_prometheus;

DROP DATABASE IF EXISTS mysqltest_sisyfos;

DROP DATABASE IF EXISTS mysqltest_bob;

DROP DATABASE IF EXISTS mysqltest_bob;

CREATE DATABASE mysqltest_prometheus;

CREATE DATABASE mysqltest_sisyfos;

CREATE DATABASE mysqltest_bob;

USE mysqltest_sisyfos;

CREATE TABLE t1 (b int);

INSERT INTO t1 VALUES(1);

USE mysqltest_bob;

CREATE TABLE t2 (b int);

INSERT INTO t2 VALUES(2);

ALTER DATABASE mysqltest_sisyfos CHARACTER SET latin1;

USE mysqltest_sisyfos;

ALTER DATABASE mysqltest_bob CHARACTER SET latin1;

SHOW DATABASES;

Database

mysql

mysqltest_bob

mysqltest_prometheus

mysqltest_sisyfos

test

SHOW DATABASES;

Database

mysql

mysqltest_prometheus

mysqltest_sisyfos

test

DROP DATABASE IF EXISTS mysqltest_sisyfos;

USE mysqltest_prometheus;

CREATE TABLE t1 (a INT);

INSERT INTO t1 VALUES (1);

CREATE DATABASE mysqltest_sisyfos;

USE mysqltest_sisyfos;

CREATE TABLE t2 (a INT);

SHOW BINLOG EVENTS;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	4	Start	1	4	Server ver: 4.1.8-debug-log, Binlog ver: 3

master-bin.000001	79	Query	1	79	DROP DATABASE IF EXISTS mysqltest_prometheus

master-bin.000001	174	Query	1	174	DROP DATABASE IF EXISTS mysqltest_sisyfos

master-bin.000001	263	Query	1	263	CREATE DATABASE mysqltest_prometheus

master-bin.000001	350	Query	1	350	CREATE DATABASE mysqltest_sisyfos

master-bin.000001	431	Query	1	431	use `mysqltest_sisyfos`; CREATE TABLE t1 (b int)

master-bin.000001	502	Query	1	502	use `mysqltest_sisyfos`; INSERT INTO t1 VALUES(1)

master-bin.000001	574	Query	1	574	ALTER DATABASE mysqltest_sisyfos CHARACTER SET latin1

master-bin.000001	675	Query	1	675	DROP DATABASE IF EXISTS mysqltest_sisyfos

master-bin.000001	764	Query	1	764	use `mysqltest_prometheus`; CREATE TABLE t1 (a INT)

master-bin.000001	838	Query	1	838	use `mysqltest_prometheus`; INSERT INTO t1 VALUES (1)

master-bin.000001	914	Query	1	914	CREATE DATABASE mysqltest_sisyfos

master-bin.000001	995	Query	1	995	use `mysqltest_sisyfos`; CREATE TABLE t2 (a INT)

SHOW DATABASES;

Database

mysql

mysqltest_bob

mysqltest_prometheus

mysqltest_sisyfos

test

SHOW DATABASES;

Database

mysql

mysqltest_prometheus

mysqltest_sisyfos

test

SHOW CREATE TABLE mysqltest_prometheus.t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW CREATE TABLE mysqltest_sisyfos.t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP DATABASE IF EXISTS mysqltest_prometheus;

DROP DATABASE IF EXISTS mysqltest_sisyfos;

DROP DATABASE IF EXISTS mysqltest_bob;

mysql-test/r/rpl_loaddata_rule_m.result

+2 −0
Original line number Diff line number Diff line
@@ -12,4 +12,6 @@ use mysqltest; 
load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	79	Query	1	79	drop database if exists mysqltest

master-bin.000001	152	Query	1	152	create database mysqltest

drop database mysqltest;

mysql-test/t/rpl_charset.test

+3 −3
Original line number Diff line number Diff line
@@ -154,9 +154,9 @@ select hex(c1), hex(c2) from t1; 


stop slave;

delete from t1;

change master to master_log_pos=5801;

start slave until master_log_file='master-bin.000001', master_log_pos=5937;

# Slave is supposed to stop _after_ the INSERT, even though 5937 is

change master to master_log_pos=5847;

start slave until master_log_file='master-bin.000001', master_log_pos=5983;

# Slave is supposed to stop _after_ the INSERT, even though 5983 is

# the position of the beginning of the INSERT; after SET slave is not

# supposed to increment position.

wait_for_slave_to_stop;