mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	Fixed compiler warnings Fix core dump when sending SIGHUP to mysqld mysql-test/r/drop_temp_table.result: After merge fixes mysql-test/r/grant.result: After merge fixes mysql-test/r/group_min_max.result: After merge fixes mysql-test/r/innodb.result: After merge fixes mysql-test/r/insert_select.result: After merge fixes mysql-test/r/rpl_charset.result: After merge fixes mysql-test/r/rpl_create_database.result: After merge fixes mysql-test/r/rpl_loaddata_rule_m.result: After merge fixes mysql-test/t/rpl_charset.test: After merge fixes mysql-test/t/rpl_create_database.test: After merge fixes sql-common/client.c: After merge fixes sql/item.cc: After merge fixes sql/mysqld.cc: Fix core dump when sending SIGHUP to mysqld sql/sql_acl.cc: Better comment sql/sql_derived.cc: Fixed comment Added missing DBUG_RETURN sql/sql_insert.cc: Fixed compiler warnings After merge fixes sql/sql_lex.cc: After merge fixes Removed compiler warnings sql/sql_parse.cc: After merge fixes sql/sql_select.cc: More debugging sql/sql_table.cc: Added missing DBUG_VOID_RETURN sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Added missing DBUG_RETURN Fixed compiler warnings Added flag to signal that the view is a derived table
		
			
				
	
	
		
			210 lines
		
	
	
		
			9.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			210 lines
		
	
	
		
			9.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| 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 mysqltest2;
 | ||
| drop database if exists mysqltest3;
 | ||
| create database mysqltest2 character set latin2;
 | ||
| set @@character_set_server=latin5;
 | ||
| create database mysqltest3;
 | ||
| 
 | ||
| --- --master--
 | ||
| show create database mysqltest2;
 | ||
| Database	Create Database
 | ||
| mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
 | ||
| show create database mysqltest3;
 | ||
| Database	Create Database
 | ||
| mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
 | ||
| 
 | ||
| --- --slave--
 | ||
| show create database mysqltest2;
 | ||
| Database	Create Database
 | ||
| mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
 | ||
| show create database mysqltest3;
 | ||
| Database	Create Database
 | ||
| mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
 | ||
| set @@collation_server=armscii8_bin;
 | ||
| drop database mysqltest3;
 | ||
| create database mysqltest3;
 | ||
| 
 | ||
| --- --master--
 | ||
| show create database mysqltest3;
 | ||
| Database	Create Database
 | ||
| mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
 | ||
| 
 | ||
| --- --slave--
 | ||
| show create database mysqltest3;
 | ||
| Database	Create Database
 | ||
| mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
 | ||
| use mysqltest2;
 | ||
| create table t1 (a int auto_increment primary key, b varchar(100));
 | ||
| set character_set_client=cp850, collation_connection=latin2_croatian_ci;
 | ||
| insert into t1 (b) values(@@character_set_server);
 | ||
| insert into t1 (b) values(@@collation_server);
 | ||
| insert into t1 (b) values(@@character_set_client);
 | ||
| insert into t1 (b) values(@@character_set_connection);
 | ||
| insert into t1 (b) values(@@collation_connection);
 | ||
| 
 | ||
| --- --master--
 | ||
| select * from t1 order by a;
 | ||
| a	b
 | ||
| 1	armscii8
 | ||
| 2	armscii8_bin
 | ||
| 3	cp850
 | ||
| 4	latin2
 | ||
| 5	latin2_croatian_ci
 | ||
| 
 | ||
| --- --slave--
 | ||
| select * from mysqltest2.t1 order by a;
 | ||
| a	b
 | ||
| 1	armscii8
 | ||
| 2	armscii8_bin
 | ||
| 3	cp850
 | ||
| 4	latin2
 | ||
| 5	latin2_croatian_ci
 | ||
| set character_set_client=latin1, collation_connection=latin1_german1_ci;
 | ||
| truncate table t1;
 | ||
| insert into t1 (b) values(@@collation_connection);
 | ||
| insert into t1 (b) values(LEAST("M<>ller","Muffler"));
 | ||
| set collation_connection=latin1_german2_ci;
 | ||
| insert into t1 (b) values(@@collation_connection);
 | ||
| insert into t1 (b) values(LEAST("M<>ller","Muffler"));
 | ||
| 
 | ||
| --- --master--
 | ||
| select * from t1 order by a;
 | ||
| a	b
 | ||
| 1	latin1_german1_ci
 | ||
| 2	Muffler
 | ||
| 3	latin1_german2_ci
 | ||
| 4	M<>ller
 | ||
| 
 | ||
| --- --slave--
 | ||
| select * from mysqltest2.t1 order by a;
 | ||
| a	b
 | ||
| 1	latin1_german1_ci
 | ||
| 2	Muffler
 | ||
| 3	latin1_german2_ci
 | ||
| 4	M<>ller
 | ||
| load data infile '../../std_data/words.dat' into table t1 (b);
 | ||
| set @a= _cp850 'M<>ller' collate cp850_general_ci;
 | ||
| truncate table t1;
 | ||
| insert into t1 (b) values(collation(@a));
 | ||
| 
 | ||
| --- --master--
 | ||
| select * from t1 order by a;
 | ||
| a	b
 | ||
| 1	cp850_general_ci
 | ||
| 
 | ||
| --- --slave--
 | ||
| select * from mysqltest2.t1 order by a;
 | ||
| a	b
 | ||
| 1	cp850_general_ci
 | ||
| drop database mysqltest2;
 | ||
| drop database mysqltest3;
 | ||
| show binlog events from 95;
 | ||
| Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 | ||
| master-bin.000001	#	Query	1	#	drop database if exists mysqltest2
 | ||
| master-bin.000001	#	Query	1	#	drop database if exists mysqltest3
 | ||
| master-bin.000001	#	Query	1	#	create database mysqltest2 character set latin2
 | ||
| master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=30
 | ||
| master-bin.000001	#	Query	1	#	create database mysqltest3
 | ||
| master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Query	1	#	drop database mysqltest3
 | ||
| master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Query	1	#	create database mysqltest3
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=1
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@character_set_server)
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=2
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@collation_server)
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=3
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@character_set_client)
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=4
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@character_set_connection)
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=5
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; truncate table t1
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=1
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=2
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(LEAST("M<>ller","Muffler"))
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=3
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=4
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(LEAST("M<>ller","Muffler"))
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=74
 | ||
| master-bin.000001	#	Create_file	1	#	db=mysqltest2;table=t1;file_id=1;block_len=581
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=5
 | ||
| master-bin.000001	#	Exec_load	1	#	;file_id=1
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; truncate table t1
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Intvar	1	#	INSERT_ID=1
 | ||
| master-bin.000001	#	User var	1	#	@`a`=_cp850 0x4DFC6C6C6572 COLLATE cp850_general_ci
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(collation(@a))
 | ||
| master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Query	1	#	drop database mysqltest2
 | ||
| master-bin.000001	#	Query	1	#	SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 | ||
| master-bin.000001	#	Query	1	#	drop database mysqltest3
 | ||
| set global character_set_server=latin2;
 | ||
| ERROR HY000: Binary logging and replication forbid changing the global server character set, collation
 | ||
| set global character_set_server=latin2;
 | ||
| ERROR HY000: Binary logging and replication forbid changing the global server character set, collation
 | ||
| set one_shot @@character_set_server=latin5;
 | ||
| set @@max_join_size=1000;
 | ||
| select @@character_set_server;
 | ||
| @@character_set_server
 | ||
| latin5
 | ||
| select @@character_set_server;
 | ||
| @@character_set_server
 | ||
| latin1
 | ||
| set @@character_set_server=latin5;
 | ||
| select @@character_set_server;
 | ||
| @@character_set_server
 | ||
| latin5
 | ||
| select @@character_set_server;
 | ||
| @@character_set_server
 | ||
| latin5
 | ||
| set one_shot max_join_size=10;
 | ||
| ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server
 | ||
| set character_set_client=9999999;
 | ||
| ERROR 42000: Unknown character set: '9999999'
 | ||
| set collation_server=9999998;
 | ||
| ERROR HY000: Unknown collation: '9999998'
 | ||
| use test;
 | ||
| CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255));
 | ||
| SET CHARACTER_SET_CLIENT=koi8r,
 | ||
| CHARACTER_SET_CONNECTION=cp1251, 
 | ||
| CHARACTER_SET_RESULTS=koi8r;
 | ||
| INSERT INTO t1 (c1, c2) VALUES ('<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>');
 | ||
| select hex(c1), hex(c2) from t1;
 | ||
| hex(c1)	hex(c2)
 | ||
| CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 | ||
| select hex(c1), hex(c2) from t1;
 | ||
| hex(c1)	hex(c2)
 | ||
| CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 | ||
| stop slave;
 | ||
| delete from t1;
 | ||
| change master to master_log_pos=6809;
 | ||
| start slave until master_log_file='master-bin.000001', master_log_pos=6967;
 | ||
| start slave;
 | ||
| select hex(c1), hex(c2) from t1;
 | ||
| hex(c1)	hex(c2)
 | ||
| CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 | ||
| drop table t1;
 |