Manual merge from mysql-trunk-merge.

Conflicts:
  - mysql-test/t/bug46080.test

mysql-test/extra/rpl_tests/rpl_current_user.test

---let $count=1
-connection master;
-
-if (`SELECT '$diff_table' = ''`)
-{
-  let $diff_table= mysql.user;
-}
-
---echo 
---echo 
---echo 
---echo TEST STATEMENT: '$statement'
---echo --------------------------------------------------------------------------
-
-if (`SELECT '$diff_columns' = ''`)
-{
-  eval CREATE VIEW test.bug48321_v1 AS SELECT user FROM $diff_table
-        WHERE user LIKE 'bug48321%';
-}
-
-if (`SELECT '$diff_columns' <> ''`)
-{
-  eval CREATE VIEW test.bug48321_v1 AS SELECT user, $diff_columns
-       FROM $diff_table WHERE user LIKE 'bug48321%';
-}
-
-while (`SELECT $count < 6`)
-{
-  --echo
-  --echo TEST STATEMENT: '$statement'
-  --echo CASE $count:
-  --echo -------
-
-  let $user2= 'bug48321_2'@'localhost';
-  let $user3= 'bug48321_3'@'localhost';
-
-  let $user1= CURRENT_USER();
-  if (`SELECT '$action'='RENAME'`)
-  {
-    let $user1= $user1 TO 'bug48321_4'@'localhost';
-    let $user2= $user2 TO 'bug48321_5'@'localhost';
-    let $user3= $user3 TO 'bug48321_6'@'localhost';
-  }
-
-  if (`SELECT '$action'='GRANT'`)
-  {
-    let $user1= $user1 IDENTIFIED BY 'user1';
-    let $user3= $user3 IDENTIFIED BY '';
-  }
-
-  if (`SELECT $count=1`)
-  {
-   --echo # Only CURRENT_USER() in the user list of the test statement.
-    let $users_list= $user1;
-  }
-
-  if (`SELECT $count=2`)
-  {
-    --echo # Two users are in the test statement, CURRENT_USER is the first one.
-    let $users_list= $user1, $user2;
-  }
-
-  if (`SELECT $count=3`)
-  {
-    --echo # Two users are in the test statement, CURRENT_USER is the last one.
-    let $users_list= $user2, $user1;
-  }
-
-  if (`SELECT $count=4`)
-  {
-    --echo # Three users are in the test statement, CURRENT_USER is the second one.
-    let $users_list= $user2, $user1, $user3;
-  }
-
-  if (`SELECT $count=5`)
-  {
-    --echo # CURRENT_USER is not in the test statement.
-    let $users_list= $user2, $user3;
-  }
-
-  --echo users_list= $users_list
-  --echo
-  --echo # Connect to master with user1, so user1 always is the current user,
-  --echo # when test statement is runing.
-  eval GRANT ALL PRIVILEGES ON *.* TO 'bug48321_1'@'localhost'
-       WITH GRANT OPTION; 
-  eval CREATE USER 'bug48321_2'@'localhost', 'bug48321_3'@'localhost'
-       IDENTIFIED BY 'user3';
-
-  if (`SELECT '$action'='REVOKE'`)
-  {
-    --echo
-    --echo # Grant some privileges to users at first when testing 
-    --echo # 'REVOKE ...' statement.
-    eval GRANT ALL PRIVILEGES ON *.* TO 'bug48321_2'@'localhost',
-         'bug48321_3'@'localhost' WITH GRANT OPTION; 
-    eval GRANT ALTER ROUTINE, EXECUTE ON PROCEDURE p1 TO 'bug48321_1'@'localhost',
-         'bug48321_2'@'localhost', 'bug48321_3'@'localhost';
-  }
-
-  connect (conn1, 127.0.0.1, 'bug48321_1'@'localhost',,);
-  connection conn1;
-  --echo
-  let $temp= `SELECT "$statement"`;
-  eval $temp;
-  --echo
-
-  disconnect conn1;
-
-  connection master;
-  sync_slave_with_master;
-
-  connection master;
-  let $diff_table_1= master:test.bug48321_v1;
-  let $diff_table_2= slave:test.bug48321_v1;
-  source include/diff_tables.inc;
-  --echo
-
-  --echo # Delete all bug48321% users
-  connection master;
-  DELETE FROM mysql.user WHERE user LIKE 'bug48321%';
-  DELETE FROM mysql.procs_priv WHERE user LIKE 'bug48321%';
-  FLUSH PRIVILEGES;
-
-  inc $count;
-}
-DROP VIEW test.bug48321_v1;

mysql-test/r/bug46080.result

@@ -2,8 +2,8 @@
 # Bug #46080: group_concat(... order by) crashes server when
 #  sort_buffer_size cannot allocate
 #
-call mtr.add_suppression("Out of memory at line .*, 'my_alloc.c'");
-call mtr.add_suppression("needed .* byte .*k., memory in use: .* bytes .*k");
+call mtr.add_suppression("Out of memory at line .*, '.*my_alloc.c'");
+call mtr.add_suppression("needed .* byte (.*k)., memory in use: .* bytes (.*k)");
 CREATE TABLE t1(a CHAR(255));
 INSERT INTO t1 VALUES ('a');
 SET @@SESSION.sort_buffer_size=5*16*1000000;

mysql-test/suite/rpl/r/rpl_binlog_grant.result

@@ -17,15 +17,16 @@ show grants for x@y;
 Grants for x@y
 GRANT USAGE ON *.* TO 'x'@'y'
 GRANT SELECT ON `d1`.`t` TO 'x'@'y'
-show binlog events from <binlog_start>;
+show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	drop database if exists d1
-master-bin.000001	#	Query	#	#	create database d1
-master-bin.000001	#	Query	#	#	use `d1`; create table t (s1 int) engine=innodb
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `d1`; insert into t values (1)
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `d1`; grant select on t to 'x'@'y'
+master-bin.000001	4	Format_desc	1	107	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	107	Query	1	194	drop database if exists d1
+master-bin.000001	194	Query	1	273	create database d1
+master-bin.000001	273	Query	1	371	use `d1`; create table t (s1 int) engine=innodb
+master-bin.000001	371	Query	1	437	BEGIN
+master-bin.000001	437	Query	1	522	use `d1`; insert into t values (1)
+master-bin.000001	522	Xid	1	549	COMMIT /* XID */
+master-bin.000001	549	Query	1	634	use `d1`; grant select on t to x@y
 start transaction;
 insert into t values (2);
 revoke select on t from x@y;
@@ -37,18 +38,19 @@ s1
 show grants for x@y;
 Grants for x@y
 GRANT USAGE ON *.* TO 'x'@'y'
-show binlog events from <binlog_start>;
+show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	drop database if exists d1
-master-bin.000001	#	Query	#	#	create database d1
-master-bin.000001	#	Query	#	#	use `d1`; create table t (s1 int) engine=innodb
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `d1`; insert into t values (1)
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `d1`; grant select on t to 'x'@'y'
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `d1`; insert into t values (2)
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `d1`; revoke select on t from 'x'@'y'
+master-bin.000001	4	Format_desc	1	107	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	107	Query	1	194	drop database if exists d1
+master-bin.000001	194	Query	1	273	create database d1
+master-bin.000001	273	Query	1	371	use `d1`; create table t (s1 int) engine=innodb
+master-bin.000001	371	Query	1	437	BEGIN
+master-bin.000001	437	Query	1	522	use `d1`; insert into t values (1)
+master-bin.000001	522	Xid	1	549	COMMIT /* XID */
+master-bin.000001	549	Query	1	634	use `d1`; grant select on t to x@y
+master-bin.000001	634	Query	1	700	BEGIN
+master-bin.000001	700	Query	1	785	use `d1`; insert into t values (2)
+master-bin.000001	785	Xid	1	812	COMMIT /* XID */
+master-bin.000001	812	Query	1	900	use `d1`; revoke select on t from x@y
 drop user x@y;
 drop database d1;

mysql-test/suite/rpl/r/rpl_events.result

@@ -161,45 +161,3 @@ DROP EVENT event44331_1;
 DROP EVENT event44331_2;
 DROP EVENT event44331_3;
 DROP EVENT event44331_4;
-DROP VIEW IF EXISTS events_view;
-DROP EVENT IF EXISTS event48321_1;
-DROP EVENT IF EXISTS event48321_2;
-DROP EVENT IF EXISTS event48321_3;
-DROP EVENT IF EXISTS event48321_4;
-CREATE VIEW events_view AS
-SELECT EVENT_SCHEMA, EVENT_NAME, DEFINER FROM INFORMATION_SCHEMA.EVENTS
-WHERE EVENT_NAME LIKE 'event48321%';
-CREATE DEFINER=CURRENT_USER() /*!50000 EVENT event48321_1 */
-ON SCHEDULE AT CURRENT_TIMESTAMP
-ON COMPLETION PRESERVE DISABLE
-DO SELECT 48321 as BUG;
-CREATE DEFINER=CURRENT_USER() EVENT event48321_2
-ON SCHEDULE AT CURRENT_TIMESTAMP
-ON COMPLETION PRESERVE DISABLE
-DO SELECT 48321 as BUG;
-CREATE /*!50000 DEFINER=CURRENT_USER() */ EVENT event48321_3
-ON SCHEDULE AT CURRENT_TIMESTAMP
-ON COMPLETION PRESERVE DISABLE
-DO SELECT 48321 as BUG;
-Comparing tables master:test.events_view and slave:test.events_view
-ALTER DEFINER=CURRENT_USER() EVENT event48321_1 RENAME TO event48321_4;
-ALTER DEFINER=CURRENT_USER() EVENT event48321_2
-ON SCHEDULE AT CURRENT_TIMESTAMP
-ON COMPLETION PRESERVE DISABLE
-DO SELECT 48321 as BUG;
-ALTER /*!50000 DEFINER=CURRENT_USER() */ EVENT event48321_3
-ON SCHEDULE AT CURRENT_TIMESTAMP
-ON COMPLETION PRESERVE DISABLE
-DO SELECT 48321 as BUG;
-Comparing tables master:test.events_view and slave:test.events_view
-ALTER /*!50000 DEFINER=CURRENT_USER() */ EVENT event48321_3
-ON SCHEDULE AT CURRENT_TIMESTAMP
-ON COMPLETION PRESERVE DISABLE
-DO SELECT 48321 as BUG; ALTER EVENT event48321_2 ENABLE |
-Comparing tables master:test.events_view and slave:test.events_view
-ALTER EVENT event48321_3 ENABLE;
-Comparing tables master:test.events_view and slave:test.events_view
-DROP EVENT event48321_4;
-DROP EVENT event48321_2;
-DROP EVENT event48321_3;
-DROP VIEW events_view;

mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result

@@ -750,7 +750,7 @@ test_rpl	e2	root@localhost	SYSTEM	RECURRING	NULL	1	#	#	NULL	ENABLED	1	latin1	lat
 USE test_rpl;
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-test_rpl	e2	root@localhost	SYSTEM	RECURRING	NULL	1	#	#	NULL	SLAVESIDE_DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+test_rpl	e2	@	SYSTEM	RECURRING	NULL	1	#	#	NULL	SLAVESIDE_DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 ==========MASTER==========
 SELECT COUNT(*) FROM t1;
 COUNT(*)
@@ -1077,7 +1077,7 @@ master-bin.000001	#	Query	1	#	BEGIN
 master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 'test1')
 master-bin.000001	#	Xid	1	#	#
 master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE DEFINER=`root`@`localhost` EVENT e1 ON SCHEDULE EVERY '1' SECOND COMMENT 'e_second_comment' DO DELETE FROM t1
-master-bin.000001	#	Query	1	#	use `test_rpl`; ALTER DEFINER=`root`@`localhost` EVENT e1 RENAME TO e2
+master-bin.000001	#	Query	1	#	use `test_rpl`; ALTER EVENT e1 RENAME TO e2
 master-bin.000001	#	Query	1	#	use `test_rpl`; DROP EVENT e2
 master-bin.000001	#	Query	1	#	BEGIN
 master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1

mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result

@@ -213,7 +213,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(ddl_case) VALUES (26)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `test`; ALTER DEFINER=`root`@`localhost` EVENT evt COMMENT 'evt'
+master-bin.000001	#	Query	#	#	use `test`; ALTER EVENT evt COMMENT 'evt'
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-

mysql-test/suite/rpl/r/rpl_sp.result

@@ -436,9 +436,9 @@ master-bin.000001	#	Query	#	#	use `mysqltest1`; create table t2 like t1
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo3`()
     DETERMINISTIC
 insert into t1 values (15)
-master-bin.000001	#	Query	#	#	use `mysqltest1`; grant CREATE ROUTINE, EXECUTE on mysqltest1.* to 'zedjzlcsjhd'@'127.0.0.1'
-master-bin.000001	#	Query	#	#	use `mysqltest1`; grant SELECT on mysqltest1.t1 to 'zedjzlcsjhd'@'127.0.0.1'
-master-bin.000001	#	Query	#	#	use `mysqltest1`; grant SELECT, INSERT on mysqltest1.t2 to 'zedjzlcsjhd'@'127.0.0.1'
+master-bin.000001	#	Query	#	#	use `mysqltest1`; grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` PROCEDURE `foo4`()
     DETERMINISTIC
 begin
@@ -551,7 +551,7 @@ select * from t1
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop function fn1
 master-bin.000001	#	Query	#	#	drop database mysqltest1
-master-bin.000001	#	Query	#	#	DROP USER 'zedjzlcsjhd'@'127.0.0.1'
+master-bin.000001	#	Query	#	#	drop user "zedjzlcsjhd"@127.0.0.1
 master-bin.000001	#	Query	#	#	use `test`; drop function if exists f1
 master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
     READS SQL DATA
@@ -736,13 +736,13 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `foo3`()
 insert into t1 values (15)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
-grant CREATE ROUTINE, EXECUTE on mysqltest1.* to 'zedjzlcsjhd'@'127.0.0.1'
+grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
-grant SELECT on mysqltest1.t1 to 'zedjzlcsjhd'@'127.0.0.1'
+grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
-grant SELECT, INSERT on mysqltest1.t2 to 'zedjzlcsjhd'@'127.0.0.1'
+grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` PROCEDURE `foo4`()
@@ -1017,7 +1017,7 @@ SET TIMESTAMP=t/*!*/;
 drop database mysqltest1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
-DROP USER 'zedjzlcsjhd'@'127.0.0.1'
+drop user "zedjzlcsjhd"@127.0.0.1
 /*!*/;
 use test/*!*/;
 SET TIMESTAMP=t/*!*/;

mysql-test/suite/rpl/t/rpl_binlog_grant.test

@@ -25,7 +25,9 @@ grant select on t to x@y;
 #
 rollback;
 show grants for x@y;
---source include/show_binlog_events.inc
+--replace_result $VERSION VERSION
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
+show binlog events;
 start transaction;
 insert into t values (2);
 revoke select on t from x@y;
@@ -35,7 +37,9 @@ revoke select on t from x@y;
 commit;
 select * from t;
 show grants for x@y;
---source include/show_binlog_events.inc
+--replace_result $VERSION VERSION
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
+show binlog events;
 drop user x@y;
 drop database d1;
 --sync_slave_with_master

mysql-test/suite/rpl/t/rpl_events.test

@@ -95,85 +95,3 @@ DROP EVENT event44331_2;
 DROP EVENT event44331_3;
 DROP EVENT event44331_4;
 sync_slave_with_master;
-
-#
-# BUG#48321
-# This test verifies if the definer is consistent between master and slave,
-# when the event is created or altered with the DEFINER clause that the
-# DEFINER is set to CURRENT_USER()
-#
-connection master;
---disable_warnings
-DROP VIEW IF EXISTS events_view;
-DROP EVENT IF EXISTS event48321_1;
-DROP EVENT IF EXISTS event48321_2;
-DROP EVENT IF EXISTS event48321_3;
-DROP EVENT IF EXISTS event48321_4;
---enable_warnings
-
-CREATE VIEW events_view AS
-  SELECT EVENT_SCHEMA, EVENT_NAME, DEFINER FROM INFORMATION_SCHEMA.EVENTS
-  WHERE EVENT_NAME LIKE 'event48321%';
-let $diff_table_1= master:test.events_view;
-let $diff_table_2= slave:test.events_view;
-
-CREATE DEFINER=CURRENT_USER() /*!50000 EVENT event48321_1 */
-  ON SCHEDULE AT CURRENT_TIMESTAMP
-  ON COMPLETION PRESERVE DISABLE
-  DO SELECT 48321 as BUG;
-            
-CREATE DEFINER=CURRENT_USER() EVENT event48321_2
-  ON SCHEDULE AT CURRENT_TIMESTAMP
-  ON COMPLETION PRESERVE DISABLE
-  DO SELECT 48321 as BUG;
-
-CREATE /*!50000 DEFINER=CURRENT_USER() */ EVENT event48321_3
-  ON SCHEDULE AT CURRENT_TIMESTAMP
-  ON COMPLETION PRESERVE DISABLE
-  DO SELECT 48321 as BUG;
-sync_slave_with_master;
-
---source include/diff_tables.inc
-
-connection master;
-ALTER DEFINER=CURRENT_USER() EVENT event48321_1 RENAME TO event48321_4;
-
-ALTER DEFINER=CURRENT_USER() EVENT event48321_2
-  ON SCHEDULE AT CURRENT_TIMESTAMP
-  ON COMPLETION PRESERVE DISABLE
-  DO SELECT 48321 as BUG;
-
-ALTER /*!50000 DEFINER=CURRENT_USER() */ EVENT event48321_3
-  ON SCHEDULE AT CURRENT_TIMESTAMP
-  ON COMPLETION PRESERVE DISABLE
-  DO SELECT 48321 as BUG;
-sync_slave_with_master;
-
---source include/diff_tables.inc
-
-# Two statements in on query
-connection master;
-DELIMITER |;
-ALTER /*!50000 DEFINER=CURRENT_USER() */ EVENT event48321_3
-  ON SCHEDULE AT CURRENT_TIMESTAMP
-  ON COMPLETION PRESERVE DISABLE
-  DO SELECT 48321 as BUG; ALTER EVENT event48321_2 ENABLE |
-DELIMITER ;|
-sync_slave_with_master;
-
---source include/diff_tables.inc
-
-#No Event boday
-connection master;
-ALTER EVENT event48321_3 ENABLE;
-sync_slave_with_master;
-
---source include/diff_tables.inc
-
-connection master;
-DROP EVENT event48321_4;
-DROP EVENT event48321_2;
-DROP EVENT event48321_3;
-DROP VIEW events_view;
---source include/master-slave-end.inc
-

mysql-test/suite/rpl/t/rpl_user.test

@@ -54,85 +54,8 @@ drop user 'not_exist_user1'@'fakehost', 'not_exist_user2'@'fakehost';
 sync_slave_with_master;
 select Host,User from mysql.user where Host='fakehost';
 
-connection master;
-source include/show_binlog_events.inc;
-
 #
-# BUG#48321
+# show the binlog events on the master
 #
-let $action= RENAME;
-let $statement= RENAME USER \$users_list;
-source extra/rpl_tests/rpl_current_user.test;
-
-let $action= DROP;
-let $statement= DROP USER \$users_list;
-source extra/rpl_tests/rpl_current_user.test;
-
---disable_warnings
-DROP PROCEDURE IF EXISTS f1;
---enable_warnings
-CREATE PROCEDURE p1() SELECT 1;
-#REVOKE ALL PRIVILEGES
-let $action= REVOKE;
-let $diff_columns= Select_priv, Update_priv, Create_priv, Drop_priv, Grant_priv;
-let $statement= REVOKE ALL PRIVILEGES, GRANT OPTION FROM \$users_list;
-source extra/rpl_tests/rpl_current_user.test;
-
-#REVOKE ALL PRIVILEGES with comment
-let $action= REVOKE;
-let $diff_columns= Select_priv, Update_priv, Create_priv, Drop_priv, Grant_priv;
-let $statement= REVOKE ALL PRIVILEGES, GRANT OPTION FROM \$users_list /*With comment*/;
-source extra/rpl_tests/rpl_current_user.test;
-
-#REVOKE ALL PRIVILEGES with comment
-let $action= REVOKE;
-let $diff_columns= Select_priv, Update_priv, Create_priv, Drop_priv, Grant_priv;
-let $statement= REVOKE ALL PRIVILEGES, GRANT OPTION FROM /*With comment*/ \$users_list;
-source extra/rpl_tests/rpl_current_user.test;
-
-let $diff_columns= Select_priv, Update_priv, Create_priv, Drop_priv;
-#REVOKE ON TABLE
-let $statement= REVOKE SELECT, UPDATE, CREATE, DROP ON TABLE *.* FROM \$users_list;
-source extra/rpl_tests/rpl_current_user.test;
-
-#REVOKE ON CREATE ROUTINE
-let $diff_columns= Create_routine_priv;
-let $statement= REVOKE CREATE ROUTINE ON *.* FROM \$users_list;
-source extra/rpl_tests/rpl_current_user.test;
-
-#REVOKE ON ROUTINE
-let $diff_table= mysql.procs_priv;
-let $diff_columns= Routine_name, Proc_priv;
-let $statement= REVOKE ALTER ROUTINE, EXECUTE ON PROCEDURE p1 FROM \$users_list;
-source extra/rpl_tests/rpl_current_user.test;
-
-let $diff_table= mysql.user;
-#GRANT ALL PRIVILEGES
-let $action= GRANT;
-let $diff_columns= Select_priv, Update_priv, Create_priv, Drop_priv, Grant_priv, Password;
-let $statement= GRANT ALL PRIVILEGES ON *.* TO \$users_list WITH GRANT OPTION;
-source extra/rpl_tests/rpl_current_user.test;
-
-#GRANT ALL PRIVILEGES with comment
-let $action= GRANT;
-let $diff_columns= Select_priv, Update_priv, Create_priv, Drop_priv, Grant_priv, Password;
-let $statement= GRANT ALL PRIVILEGES ON *.* TO \$users_list /* With Comment */ WITH GRANT OPTION;
-source extra/rpl_tests/rpl_current_user.test;
-
-#GRANT ON TABLE
-let $diff_columns= Select_priv, Update_priv, Create_priv, Drop_priv, Password;
-let $statement= GRANT SELECT, UPDATE, CREATE, DROP ON TABLE *.* TO \$users_list;
-source extra/rpl_tests/rpl_current_user.test;
-
-#GRANT ON CREATE ROUTINE
-let $diff_columns= Create_routine_priv;
-let $statement= GRANT CREATE ROUTINE ON *.* TO \$users_list;
-source extra/rpl_tests/rpl_current_user.test;
-
-#GRANT ON ROUTINE
-let $diff_table= mysql.procs_priv;
-let $diff_columns= Routine_name, Proc_priv;
-let $statement= GRANT ALTER ROUTINE, EXECUTE ON PROCEDURE p1 TO \$users_list;
-
-DROP PROCEDURE p1;
-source extra/rpl_tests/rpl_current_user.test;
+connection master;
+source include/show_binlog_events.inc;

mysql-test/t/bug46080.test

@@ -5,8 +5,8 @@
 
 --source include/have_debug.inc
 
-call mtr.add_suppression("Out of memory at line .*, 'my_alloc.c'");
-call mtr.add_suppression("needed .* byte .*k., memory in use: .* bytes .*k");
+call mtr.add_suppression("Out of memory at line .*, '.*my_alloc.c'");
+call mtr.add_suppression("needed .* byte (.*k)., memory in use: .* bytes (.*k)");
 
 CREATE TABLE t1(a CHAR(255));
 INSERT INTO t1 VALUES ('a');

sql/event_scheduler.cc

@@ -237,8 +237,9 @@ event_scheduler_thread(void *arg)
   if (!res)
     scheduler->run(thd);
 
+  DBUG_LEAVE;                               // Against gcc warnings
   my_thread_end();
-  DBUG_RETURN(0);                               // Against gcc warnings
+  return 0;
 }
 
 

sql/events.cc

@@ -246,48 +246,31 @@ Events::reconstruct_interval_expression(String *buf, interval_type interval,
 }
 
 
-/*
-  Binlog '{CREATE|ALTER} EVENT' statements.
-  Definer part is always rewritten, for definer can be CURRENT_USER() function.
-
+/**
+  Create a new query string for removing executable comments 
+  for avoiding leak and keeping consistency of the execution 
+  on master and slave.
+  
   @param[in] thd                 Thread handler
-  @param[in] create              CREATE or ALTER statement
+  @param[in] buf                 Query string
 
   @return
-             FASE           ok
-             TRUE           error
+             0           ok
+             1           error
 */
-static bool event_write_bin_log(THD *thd, bool create)
+static int
+create_query_string(THD *thd, String *buf)
 {
-  String log_query;
-  if (create)
-  {
-    /* Append the "CREATE" part of the query */
-    if (log_query.append(STRING_WITH_LEN("CREATE ")))
-      return TRUE;
-  }
-  else
-  {
-    /* Append the "ALETR " part of the query */
-    if (log_query.append(STRING_WITH_LEN("ALTER ")))
-      return TRUE;
-  }
-
-  /* Append definer
-     If the definer is not set or set to CURRENT_USER, the value of CURRENT_USER
-     will be written into the binary log as the definer for the SQL thread.
-   */
-  append_definer(thd, &log_query, &(thd->lex->definer->user),
-                 &(thd->lex->definer->host));
-
+  /* Append the "CREATE" part of the query */
+  if (buf->append(STRING_WITH_LEN("CREATE ")))
+    return 1;
+  /* Append definer */
+  append_definer(thd, buf, &(thd->lex->definer->user), &(thd->lex->definer->host));
   /* Append the left part of thd->query after "DEFINER" part */
-  if (log_query.append(thd->lex->stmt_definition_begin,
-                       thd->lex->stmt_definition_end -
-                       thd->lex->stmt_definition_begin))
-    return TRUE;
-
-  return write_bin_log(thd, TRUE, log_query.c_ptr_safe(), log_query.length())
-          != 0;
+  if (buf->append(thd->lex->stmt_definition_begin))
+    return 1;
+ 
+  return 0;
 }
 
 /**
@@ -302,7 +285,8 @@ static bool event_write_bin_log(THD *thd, bool create)
   @sa Events::drop_event for the notes about locking, pre-locking
   and Events DDL.
 
-  @retval  FALSE  OK @retval  TRUE   Error (reported)
+  @retval  FALSE  OK
+  @retval  TRUE   Error (reported)
 */
 
 bool
@@ -384,7 +368,22 @@ Events::create_event(THD *thd, Event_parse_data *parse_data,
       binlog the create event unless it's been successfully dropped
     */
     if (!dropped)
-      ret= event_write_bin_log(thd, TRUE);
+    {
+      /* Binlog the create event. */
+      DBUG_ASSERT(thd->query() && thd->query_length());
+      String log_query;
+      if (create_query_string(thd, &log_query))
+      {
+        sql_print_error("Event Error: An error occurred while creating query string, "
+                        "before writing it into binary log.");
+        /* Restore the state of binlog format */
+        thd->current_stmt_binlog_row_based= save_binlog_row_based;
+        DBUG_RETURN(TRUE);
+      }
+      /* If the definer is not set or set to CURRENT_USER, the value of CURRENT_USER 
+         will be written into the binary log as the definer for the SQL thread. */
+      ret= write_bin_log(thd, TRUE, log_query.c_ptr(), log_query.length());
+    }
   }
   mysql_mutex_unlock(&LOCK_event_metadata);
   /* Restore the state of binlog format */
@@ -503,7 +502,9 @@ Events::update_event(THD *thd, Event_parse_data *parse_data,
       if (event_queue)
         event_queue->update_event(thd, parse_data->dbname, parse_data->name,
                                   new_element);
-      ret= event_write_bin_log(thd, FALSE);
+      /* Binlog the alter event. */
+      DBUG_ASSERT(thd->query() && thd->query_length());
+      ret= write_bin_log(thd, TRUE, thd->query(), thd->query_length());
     }
   }
   mysql_mutex_unlock(&LOCK_event_metadata);

sql/sql_acl.cc

@@ -196,7 +196,6 @@ static bool compare_hostname(const acl_host_and_ip *host,const char *hostname,
 			     const char *ip);
 static my_bool acl_load(THD *thd, TABLE_LIST *tables);
 static my_bool grant_load(THD *thd, TABLE_LIST *tables);
-static bool acl_write_bin_log(THD *thd, List <LEX_USER> &list, bool clear_error);
 
 /*
   Convert scrambled password to binary form, according to scramble type, 
@@ -3271,8 +3270,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
 
   if (!result) /* success */
   {
-    if (acl_write_bin_log(thd, user_list, TRUE))
-      result= -1;
+    result= write_bin_log(thd, TRUE, thd->query(), thd->query_length());
   }
 
   mysql_rwlock_unlock(&LOCK_grant);
@@ -3448,7 +3446,8 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
 
   if (write_to_binlog)
   {
-    result|= acl_write_bin_log(thd, user_list, FALSE);
+    if (write_bin_log(thd, FALSE, thd->query(), thd->query_length()))
+      result= TRUE;
   }
 
   mysql_rwlock_unlock(&LOCK_grant);
@@ -3577,7 +3576,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
 
   if (!result)
   {
-    result= acl_write_bin_log(thd, list, TRUE);
+    result= write_bin_log(thd, TRUE, thd->query(), thd->query_length());
   }
 
   mysql_rwlock_unlock(&LOCK_grant);
@@ -5756,9 +5755,9 @@ static int handle_grant_data(TABLE_LIST *tables, bool drop,
 }
 
 
-static void append_user(String *str, LEX_USER *user, bool comma= TRUE)
+static void append_user(String *str, LEX_USER *user)
 {
-  if (comma && str->length())
+  if (str->length())
     str->append(',');
   str->append('\'');
   str->append(user->user.str);
@@ -5767,65 +5766,6 @@ static void append_user(String *str, LEX_USER *user, bool comma= TRUE)
   str->append('\'');
 }
 
-/*
-  The operations(DROP, RENAME, REVOKE, GRANT) will cause inconsistency between
-  master and slave, when CURRENT_USER() is used. To solve this problem, we
-  construct a new binlog statement in which CURRENT_USER() is replaced by
-  the real user name and host name.
- */
-static bool acl_write_bin_log(THD *thd, List <LEX_USER> &list, bool clear_error)
-{
-  String log_query;
-  LEX *lex= thd->lex;
-  List_iterator <LEX_USER> user_list(list);
-  LEX_USER *user, *tmp_user;
-
-  if (!mysql_bin_log.is_open())
-    return FALSE;
-
-  if (log_query.append(lex->stmt_begin, lex->stmt_user_begin - lex->stmt_begin))
-    return TRUE;
-  while ((tmp_user= user_list++))
-  {
-    if (!(user= get_current_user(thd, tmp_user)))
-      continue;
-
-    /*
-      No User, but a password?
-      They did GRANT ... TO CURRENT_USER() IDENTIFIED BY ... !
-      Get the current user, and shallow-copy the new password to them!
-    */
-    if (!tmp_user->user.str && tmp_user->password.str)
-      user->password= tmp_user->password;
-
-    if (log_query.append(" ", 1))
-      return TRUE;
-    append_user(&log_query, user, FALSE);
-    /* Only 'GRANT' have password */
-    if (user->password.str)
-    {
-      if (log_query.append(STRING_WITH_LEN(" IDENTIFIED BY ")) ||
-                           log_query.append(STRING_WITH_LEN("PASSWORD ")) ||
-                           log_query.append("'", 1) ||
-                           log_query.append(user->password.str,
-                                            user->password.length) ||
-                           log_query.append("'", 1))
-        return TRUE;
-    }
-    if (log_query.append(",", 1))
-      return TRUE;
-  }
-  /* It is binlogged only when at least one user is in the query */
-  if (log_query.c_ptr()[log_query.length()-1] == ',')
-  {
-    log_query.length(log_query.length()-1);
-    if (log_query.append(lex->stmt_user_end, lex->stmt_end - lex->stmt_user_end))
-      return TRUE;
-    return write_bin_log(thd, clear_error, log_query.c_ptr_safe(),
-                         log_query.length()) != 0;
-  }
-  return FALSE;
-}
 
 /*
   Create a list of users.
@@ -5932,7 +5872,6 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list)
 {
   int result;
   String wrong_users;
-  String log_query;
   LEX_USER *user_name, *tmp_user_name;
   List_iterator <LEX_USER> user_list(list);
   TABLE_LIST tables[GRANT_TABLES];
@@ -5962,7 +5901,6 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list)
   mysql_rwlock_wrlock(&LOCK_grant);
   mysql_mutex_lock(&acl_cache->lock);
 
-  log_query.append(STRING_WITH_LEN("DROP USER"));
   while ((tmp_user_name= user_list++))
   {
     if (!(user_name= get_current_user(thd, tmp_user_name)))
@@ -5970,17 +5908,6 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list)
       result= TRUE;
       continue;
     }  
-
-    /*
-      The operation will cause inconsistency between master and slave, when
-      CURRENT_USER() is used. To solve this problem, we construct a new
-      binlog statement in which CURRENT_USER() is replaced by the real user
-      name and host name.
-     */
-    log_query.append(STRING_WITH_LEN(" "));
-    append_user(&log_query, user_name, FALSE);
-    log_query.append(STRING_WITH_LEN(","));
-
     if (handle_grant_data(tables, 1, user_name, NULL) <= 0)
     {
       append_user(&wrong_users, user_name);
@@ -5999,13 +5926,7 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list)
     my_error(ER_CANNOT_USER, MYF(0), "DROP USER", wrong_users.c_ptr_safe());
 
   if (some_users_deleted)
-  {
-    if (log_query.c_ptr()[log_query.length()-1] == ',')
-    {
-      log_query.length(log_query.length()-1);
-      result|= write_bin_log(thd, FALSE, log_query.c_ptr_safe(), log_query.length());
-    }
-  }
+    result |= write_bin_log(thd, FALSE, thd->query(), thd->query_length());
 
   mysql_rwlock_unlock(&LOCK_grant);
   close_thread_tables(thd);
@@ -6033,7 +5954,6 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
 {
   int result;
   String wrong_users;
-  String log_query;
   LEX_USER *user_from, *tmp_user_from;
   LEX_USER *user_to, *tmp_user_to;
   List_iterator <LEX_USER> user_list(list);
@@ -6061,7 +5981,6 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
   mysql_rwlock_wrlock(&LOCK_grant);
   mysql_mutex_lock(&acl_cache->lock);
 
-  log_query.append(STRING_WITH_LEN("RENAME USER"));
   while ((tmp_user_from= user_list++))
   {
     if (!(user_from= get_current_user(thd, tmp_user_from)))
@@ -6077,18 +5996,6 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
     }  
     DBUG_ASSERT(user_to != 0); /* Syntax enforces pairs of users. */
 
-    /*
-      The operation will cause inconsistency between master and slave, when
-      CURRENT_USER() is used. To solve this problem, we construct a new
-      binlog statement in which CURRENT_USER() is replaced by the real user
-      name and host name.
-     */
-    log_query.append(STRING_WITH_LEN(" "));
-    append_user(&log_query, user_from, FALSE);
-    log_query.append(STRING_WITH_LEN(" TO "));
-    append_user(&log_query, user_to, FALSE);
-    log_query.append(STRING_WITH_LEN(","));
-
     /*
       Search all in-memory structures and grant tables
       for a mention of the new user name.
@@ -6110,15 +6017,9 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
 
   if (result)
     my_error(ER_CANNOT_USER, MYF(0), "RENAME USER", wrong_users.c_ptr_safe());
-
-  if (some_users_renamed)
-  {
-    if (log_query.c_ptr()[log_query.length()-1] == ',')
-    {
-      log_query.length(log_query.length()-1);
-      result|= write_bin_log(thd, FALSE, log_query.c_ptr_safe(), log_query.length());
-    }
-  }
+  
+  if (some_users_renamed && mysql_bin_log.is_open())
+    result |= write_bin_log(thd, FALSE, thd->query(), thd->query_length());
 
   mysql_rwlock_unlock(&LOCK_grant);
   close_thread_tables(thd);
@@ -6308,9 +6209,8 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
 
   mysql_mutex_unlock(&acl_cache->lock);
 
-  int binlog_error= 0;
-  if (acl_write_bin_log(thd, list, FALSE))
-    binlog_error= 1;
+  int binlog_error=
+    write_bin_log(thd, FALSE, thd->query(), thd->query_length());
 
   mysql_rwlock_unlock(&LOCK_grant);
   close_thread_tables(thd);

sql/sql_lex.h

@@ -1986,8 +1986,6 @@ struct LEX: public Query_tables_list
       - CREATE TRIGGER (points to "TRIGGER");
       - CREATE PROCEDURE (points to "PROCEDURE");
       - CREATE FUNCTION (points to "FUNCTION" or "AGGREGATE");
-      - CREATE VIEW(points to "VIEW");
-      - CREATE EVENT(points to "EVENT");
 
     This pointer is required to add possibly omitted DEFINER-clause to the
     DDL-statement before dumping it to the binlog.
@@ -1996,29 +1994,6 @@ struct LEX: public Query_tables_list
 
   const char *stmt_definition_end;
 
-  /*
-    stmt_begin is intended to point to the begin of every statement.
-    It is now used in the following statements:
-      - GRANT ALL PRIVELEGES ON *.* (points to "GRANT");
-      - REVOKE ALL PRIVELEGES ON *.* (points to "REVOKE");
-   */
-  const char *stmt_begin;
-  const char *stmt_end;
-
-  /*
-    stmt_user_begin is intended to point to the begin of the user list in
-    the following statements:
-      - GRANT ALL PRIVELEGES ON *.* TO 'username'@'hostname'
-        (points to "'username'");
-      - REVOKE ALL PRIVELEGES ON *.* FROM 'username'@'hostname'
-        (points to "'username'");
-
-    these pointers are required to replace the CURRENT_USER()
-    function by the real user before dumping it to the binlog.
-   */
-  const char *stmt_user_begin;
-  const char *stmt_user_end;
-
   /**
     During name resolution search only in the table list given by 
     Name_resolution_context::first_name_resolution_table and

sql/sql_yacc.yy

@@ -1681,11 +1681,7 @@ opt_end_of_input:
         ;
 
 verb_clause:
-          remember_name statement remember_end
-          {
-            Lex->stmt_begin= $1;
-            Lex->stmt_end= $3;
-          }
+          statement
         | begin
         ;
 
@@ -6196,7 +6192,7 @@ alter:
           }
           view_tail
           {}
-        | ALTER definer_opt remember_name EVENT_SYM sp_name
+        | ALTER definer_opt EVENT_SYM sp_name
           {
             /* 
               It is safe to use Lex->spname because
@@ -6208,8 +6204,7 @@ alter:
 
             if (!(Lex->event_parse_data= Event_parse_data::new_instance(YYTHD)))
               MYSQL_YYABORT;
-            Lex->event_parse_data->identifier= $5;
-            Lex->stmt_definition_begin= $3;
+            Lex->event_parse_data->identifier= $4;
 
             Lex->sql_command= SQLCOM_ALTER_EVENT;
           }
@@ -6219,7 +6214,7 @@ alter:
           opt_ev_comment
           opt_ev_sql_stmt
           {
-            if (!($7 || $8 || $9 || $10 || $11))
+            if (!($6 || $7 || $8 || $9 || $10))
             {
               my_parse_error(ER(ER_SYNTAX_ERROR));
               MYSQL_YYABORT;
@@ -6280,16 +6275,7 @@ opt_ev_rename_to:
         ;
 
 opt_ev_sql_stmt:
-          /* empty*/
-          {
-            $$= 0;
-            /*
-              Lex->sp_head is not initialized when event body is empty.
-              So we can not use Lex->sp_head->set_stmt_end() to set
-              stmt_definition_end.
-             */
-            Lex->stmt_definition_end= (char*) YYLIP->get_cpp_tok_end();
-          }
+          /* empty*/ { $$= 0;}
         | DO_SYM ev_sql_stmt { $$= 1; }
         ;
 
@@ -12068,7 +12054,6 @@ user:
             $$->user = $1;
             $$->host.str= (char *) "%";
             $$->host.length= 1;
-            Lex->stmt_user_end= YYLIP->get_cpp_ptr();
 
             if (check_string_char_length(&$$->user, ER(ER_USERNAME),
                                          USERNAME_CHAR_LENGTH,
@@ -12081,7 +12066,6 @@ user:
             if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
               MYSQL_YYABORT;
             $$->user = $1; $$->host=$3;
-            Lex->stmt_user_end= YYLIP->get_cpp_ptr();
 
             if (check_string_char_length(&$$->user, ER(ER_USERNAME),
                                          USERNAME_CHAR_LENGTH,
@@ -12091,7 +12075,6 @@ user:
           }
         | CURRENT_USER optional_braces
           {
-            Lex->stmt_user_end= YYLIP->get_cpp_ptr();
             if (!($$=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user))))
               MYSQL_YYABORT;
             /* 
@@ -13297,10 +13280,9 @@ user_list:
         ;
 
 grant_list:
-          { Lex->stmt_user_begin= YYLIP->get_cpp_ptr(); }
           grant_user
           {
-            if (Lex->users_list.push_back($2))
+            if (Lex->users_list.push_back($1))
               MYSQL_YYABORT;
           }
         | grant_list ',' grant_user
@@ -13313,7 +13295,6 @@ grant_list:
 grant_user:
           user IDENTIFIED_SYM BY TEXT_STRING
           {
-            Lex->stmt_user_end= YYLIP->get_cpp_ptr();
             $$=$1; $1->password=$4;
             if ($4.length)
             {
@@ -13340,10 +13321,7 @@ grant_user:
             }
           }
         | user IDENTIFIED_SYM BY PASSWORD TEXT_STRING
-          {
-            Lex->stmt_user_end= YYLIP->get_cpp_ptr();
-            $$= $1; $1->password= $5;
-          }
+          { $$= $1; $1->password= $5; }
         | user
           { $$= $1; $1->password= null_lex_str; }
         ;

storage/myisammrg/ha_myisammrg.cc

@@ -381,7 +381,7 @@ static MI_INFO *myisammrg_attach_children_callback(void *callback_param)
     my_errno= HA_ERR_WRONG_MRG_TABLE_DEF;
   }
   DBUG_PRINT("myrg", ("MyISAM handle: 0x%lx  my_errno: %d",
-                      (long) myisam, my_errno));
+                      my_errno ? NULL : (long) myisam, my_errno));
 
  err:
   DBUG_RETURN(my_errno ? NULL : myisam);