After merge fixes

Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld

8 files changed, 35 insertions, 35 deletions

diff --git a/mysql-test/r/drop_temp_table.result b/mysql-test/r/drop_temp_table.result
index 08793bcbd57..34c08f08788 100644
--- a/mysql-test/r/drop_temp_table.result
+++ b/mysql-test/r/drop_temp_table.result
@@ -11,8 +11,8 @@ get_lock("a",10)
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	95	Query	1	190	use `test`; create database `drop-temp+table-test`
-master-bin.000001	190	Query	1	306	use `drop-temp+table-test`; create temporary table `table:name` (a int)
-master-bin.000001	306	Query	1	457	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`
-master-bin.000001	457	Query	1	550	use `drop-temp+table-test`; DO RELEASE_LOCK("a")
+master-bin.000001	95	Query	1	206	create database `drop-temp+table-test`
+master-bin.000001	206	Query	1	322	use `drop-temp+table-test`; create temporary table `table:name` (a int)
+master-bin.000001	322	Query	1	473	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`
+master-bin.000001	473	Query	1	566	use `drop-temp+table-test`; DO RELEASE_LOCK("a")
 drop database `drop-temp+table-test`;
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 33ca38a3bad..b69ba9702a6 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -332,10 +332,10 @@ GRANT USAGE ON *.* TO 'grant_user'@'localhost'
 GRANT INSERT (a, d, c, b) ON `test`.`t1` TO 'grant_user'@'localhost'
 select Host,Db,User,Table_name,Column_name,Column_priv from mysql.columns_priv;
 Host	Db	User	Table_name	Column_name	Column_priv
-localhost	test	grant_user	t1	c	Insert
 localhost	test	grant_user	t1	b	Insert
-localhost	test	grant_user	t1	a	Insert
 localhost	test	grant_user	t1	d	Insert
+localhost	test	grant_user	t1	a	Insert
+localhost	test	grant_user	t1	c	Insert
 revoke ALL PRIVILEGES on t1 from grant_user@localhost;
 show grants for grant_user@localhost;
 Grants for grant_user@localhost
diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result
index c291599b078..006e7052376 100644
--- a/mysql-test/r/group_min_max.result
+++ b/mysql-test/r/group_min_max.result
@@ -1365,7 +1365,7 @@ where exists ( select * from t2 where t2.c > 'b1' )
 group by a1,a2,b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	range	NULL	idx_t1_1	147	NULL	17	Using index for group-by
-2	SUBQUERY	t2	index	NULL	idx_t2_1	163	NULL	164	Using index
+2	SUBQUERY	t2	index	NULL	idx_t2_1	163	NULL	164	Using where; Using index
 explain select a1,a2,b,min(c),max(c) from t1 where (a1 >= 'c' or a2 < 'b') and (b > 'a') group by a1,a2,b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	idx_t1_0,idx_t1_1,idx_t1_2	idx_t1_1	147	NULL	17	Using where; Using index for group-by
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 4cce4ef51e0..9f19dd479c8 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1696,7 +1696,7 @@ Variable_name	Value
 Innodb_rows_inserted	31706
 show status like "Innodb_rows_read";
 Variable_name	Value
-Innodb_rows_read	80178
+Innodb_rows_read	80161
 show status like "Innodb_rows_updated";
 Variable_name	Value
 Innodb_rows_updated	29530
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
index bb7d520dcab..94d33f8090b 100644
--- a/mysql-test/r/insert_select.result
+++ b/mysql-test/r/insert_select.result
@@ -87,8 +87,8 @@ reset master;
 create table t2(unique(a)) select a from t1;
 ERROR 23000: Duplicate entry '1' for key 1
 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
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
 drop table t1;
 create table t1 (a int not null);
 create table t2 (a int not null);
diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result
index 9a002953b45..0224bd6dba2 100644
--- a/mysql-test/r/rpl_charset.result
+++ b/mysql-test/r/rpl_charset.result
@@ -105,15 +105,15 @@ 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	#	use `test`; drop database if exists mysqltest2
-master-bin.000001	#	Query	1	#	use `test`; drop database if exists mysqltest3
-master-bin.000001	#	Query	1	#	use `test`; create database mysqltest2 character set latin2
+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	#	use `test`; create database mysqltest3
+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	#	use `test`; drop database mysqltest3
+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	#	use `test`; create database mysqltest3
+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
@@ -158,7 +158,7 @@ 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	#	use `mysqltest2`; drop database mysqltest2
+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;
@@ -200,8 +200,8 @@ hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 stop slave;
 delete from t1;
-change master to master_log_pos=6763;
-start slave until master_log_file='master-bin.000001', master_log_pos=6921;
+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)
diff --git a/mysql-test/r/rpl_create_database.result b/mysql-test/r/rpl_create_database.result
index 2375e13bb5c..86282ce3cc5 100644
--- a/mysql-test/r/rpl_create_database.result
+++ b/mysql-test/r/rpl_create_database.result
@@ -41,20 +41,20 @@ 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: VERSION, 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)
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS mysqltest_prometheus
+master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS mysqltest_sisyfos
+master-bin.000001	#	Query	1	#	CREATE DATABASE mysqltest_prometheus
+master-bin.000001	#	Query	1	#	CREATE DATABASE mysqltest_sisyfos
+master-bin.000001	#	Query	1	#	use `mysqltest_sisyfos`; CREATE TABLE t1 (b int)
+master-bin.000001	#	Query	1	#	use `mysqltest_sisyfos`; INSERT INTO t1 VALUES(1)
+master-bin.000001	#	Query	1	#	ALTER DATABASE mysqltest_sisyfos CHARACTER SET latin1
+master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS mysqltest_sisyfos
+master-bin.000001	#	Query	1	#	use `mysqltest_prometheus`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	1	#	use `mysqltest_prometheus`; INSERT INTO t1 VALUES (1)
+master-bin.000001	#	Query	1	#	CREATE DATABASE mysqltest_sisyfos
+master-bin.000001	#	Query	1	#	use `mysqltest_sisyfos`; CREATE TABLE t2 (a INT)
 SHOW DATABASES;
 Database
 mysql
diff --git a/mysql-test/r/rpl_loaddata_rule_m.result b/mysql-test/r/rpl_loaddata_rule_m.result
index d11ca31fc87..b241fc9ce0b 100644
--- a/mysql-test/r/rpl_loaddata_rule_m.result
+++ b/mysql-test/r/rpl_loaddata_rule_m.result
@@ -12,6 +12,6 @@ use mysqltest;
 load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_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
+master-bin.000001	95	Query	1	190	drop database if exists mysqltest
+master-bin.000001	190	Query	1	277	create database mysqltest
 drop database mysqltest;