Skip to content

Commit 9dc8347

Browse files
author
Alexander Nozdrin
committed
Manual merge from mysql-trunk-merge.
Conflicts: - mysql-test/t/bug46080.test
2 parents 8a685b3 + 31ba3bf commit 9dc8347

18 files changed

+112
-2326
lines changed

‎mysql-test/extra/rpl_tests/rpl_current_user.test

-127
This file was deleted.

‎mysql-test/r/bug46080.result

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

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

+22-20
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@ show grants for x@y;
1717
Grants for x@y
1818
GRANT USAGE ON *.* TO 'x'@'y'
1919
GRANT SELECT ON `d1`.`t` TO 'x'@'y'
20-
show binlog events from <binlog_start>;
20+
show binlog events;
2121
Log_name Pos Event_type Server_id End_log_pos Info
22-
master-bin.000001 # Query # # drop database if exists d1
23-
master-bin.000001 # Query # # create database d1
24-
master-bin.000001 # Query # # use `d1`; create table t (s1 int) engine=innodb
25-
master-bin.000001 # Query # # BEGIN
26-
master-bin.000001 # Query # # use `d1`; insert into t values (1)
27-
master-bin.000001 # Xid # # COMMIT /* XID */
28-
master-bin.000001 # Query # # use `d1`; grant select on t to 'x'@'y'
22+
master-bin.000001 4 Format_desc 1 107 Server ver: VERSION, Binlog ver: 4
23+
master-bin.000001 107 Query 1 194 drop database if exists d1
24+
master-bin.000001 194 Query 1 273 create database d1
25+
master-bin.000001 273 Query 1 371 use `d1`; create table t (s1 int) engine=innodb
26+
master-bin.000001 371 Query 1 437 BEGIN
27+
master-bin.000001 437 Query 1 522 use `d1`; insert into t values (1)
28+
master-bin.000001 522 Xid 1 549 COMMIT /* XID */
29+
master-bin.000001 549 Query 1 634 use `d1`; grant select on t to x@y
2930
start transaction;
3031
insert into t values (2);
3132
revoke select on t from x@y;
@@ -37,18 +38,19 @@ s1
3738
show grants for x@y;
3839
Grants for x@y
3940
GRANT USAGE ON *.* TO 'x'@'y'
40-
show binlog events from <binlog_start>;
41+
show binlog events;
4142
Log_name Pos Event_type Server_id End_log_pos Info
42-
master-bin.000001 # Query # # drop database if exists d1
43-
master-bin.000001 # Query # # create database d1
44-
master-bin.000001 # Query # # use `d1`; create table t (s1 int) engine=innodb
45-
master-bin.000001 # Query # # BEGIN
46-
master-bin.000001 # Query # # use `d1`; insert into t values (1)
47-
master-bin.000001 # Xid # # COMMIT /* XID */
48-
master-bin.000001 # Query # # use `d1`; grant select on t to 'x'@'y'
49-
master-bin.000001 # Query # # BEGIN
50-
master-bin.000001 # Query # # use `d1`; insert into t values (2)
51-
master-bin.000001 # Xid # # COMMIT /* XID */
52-
master-bin.000001 # Query # # use `d1`; revoke select on t from 'x'@'y'
43+
master-bin.000001 4 Format_desc 1 107 Server ver: VERSION, Binlog ver: 4
44+
master-bin.000001 107 Query 1 194 drop database if exists d1
45+
master-bin.000001 194 Query 1 273 create database d1
46+
master-bin.000001 273 Query 1 371 use `d1`; create table t (s1 int) engine=innodb
47+
master-bin.000001 371 Query 1 437 BEGIN
48+
master-bin.000001 437 Query 1 522 use `d1`; insert into t values (1)
49+
master-bin.000001 522 Xid 1 549 COMMIT /* XID */
50+
master-bin.000001 549 Query 1 634 use `d1`; grant select on t to x@y
51+
master-bin.000001 634 Query 1 700 BEGIN
52+
master-bin.000001 700 Query 1 785 use `d1`; insert into t values (2)
53+
master-bin.000001 785 Xid 1 812 COMMIT /* XID */
54+
master-bin.000001 812 Query 1 900 use `d1`; revoke select on t from x@y
5355
drop user x@y;
5456
drop database d1;

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

-42
Original file line numberDiff line numberDiff line change
@@ -161,45 +161,3 @@ DROP EVENT event44331_1;
161161
DROP EVENT event44331_2;
162162
DROP EVENT event44331_3;
163163
DROP EVENT event44331_4;
164-
DROP VIEW IF EXISTS events_view;
165-
DROP EVENT IF EXISTS event48321_1;
166-
DROP EVENT IF EXISTS event48321_2;
167-
DROP EVENT IF EXISTS event48321_3;
168-
DROP EVENT IF EXISTS event48321_4;
169-
CREATE VIEW events_view AS
170-
SELECT EVENT_SCHEMA, EVENT_NAME, DEFINER FROM INFORMATION_SCHEMA.EVENTS
171-
WHERE EVENT_NAME LIKE 'event48321%';
172-
CREATE DEFINER=CURRENT_USER() /*!50000 EVENT event48321_1 */
173-
ON SCHEDULE AT CURRENT_TIMESTAMP
174-
ON COMPLETION PRESERVE DISABLE
175-
DO SELECT 48321 as BUG;
176-
CREATE DEFINER=CURRENT_USER() EVENT event48321_2
177-
ON SCHEDULE AT CURRENT_TIMESTAMP
178-
ON COMPLETION PRESERVE DISABLE
179-
DO SELECT 48321 as BUG;
180-
CREATE /*!50000 DEFINER=CURRENT_USER() */ EVENT event48321_3
181-
ON SCHEDULE AT CURRENT_TIMESTAMP
182-
ON COMPLETION PRESERVE DISABLE
183-
DO SELECT 48321 as BUG;
184-
Comparing tables master:test.events_view and slave:test.events_view
185-
ALTER DEFINER=CURRENT_USER() EVENT event48321_1 RENAME TO event48321_4;
186-
ALTER DEFINER=CURRENT_USER() EVENT event48321_2
187-
ON SCHEDULE AT CURRENT_TIMESTAMP
188-
ON COMPLETION PRESERVE DISABLE
189-
DO SELECT 48321 as BUG;
190-
ALTER /*!50000 DEFINER=CURRENT_USER() */ EVENT event48321_3
191-
ON SCHEDULE AT CURRENT_TIMESTAMP
192-
ON COMPLETION PRESERVE DISABLE
193-
DO SELECT 48321 as BUG;
194-
Comparing tables master:test.events_view and slave:test.events_view
195-
ALTER /*!50000 DEFINER=CURRENT_USER() */ EVENT event48321_3
196-
ON SCHEDULE AT CURRENT_TIMESTAMP
197-
ON COMPLETION PRESERVE DISABLE
198-
DO SELECT 48321 as BUG; ALTER EVENT event48321_2 ENABLE |
199-
Comparing tables master:test.events_view and slave:test.events_view
200-
ALTER EVENT event48321_3 ENABLE;
201-
Comparing tables master:test.events_view and slave:test.events_view
202-
DROP EVENT event48321_4;
203-
DROP EVENT event48321_2;
204-
DROP EVENT event48321_3;
205-
DROP VIEW events_view;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ test_rpl e2 root@localhost SYSTEM RECURRING NULL 1 # # NULL ENABLED 1 latin1 lat
750750
USE test_rpl;
751751
SHOW EVENTS;
752752
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
753-
test_rpl e2 root@localhost SYSTEM RECURRING NULL 1 # # NULL SLAVESIDE_DISABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
753+
test_rpl e2 @ SYSTEM RECURRING NULL 1 # # NULL SLAVESIDE_DISABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
754754
==========MASTER==========
755755
SELECT COUNT(*) FROM t1;
756756
COUNT(*)
@@ -1077,7 +1077,7 @@ master-bin.000001 # Query 1 # BEGIN
10771077
master-bin.000001 # Query 1 # use `test_rpl`; INSERT INTO t1 VALUES(1, 'test1')
10781078
master-bin.000001 # Xid 1 # #
10791079
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
1080-
master-bin.000001 # Query 1 # use `test_rpl`; ALTER DEFINER=`root`@`localhost` EVENT e1 RENAME TO e2
1080+
master-bin.000001 # Query 1 # use `test_rpl`; ALTER EVENT e1 RENAME TO e2
10811081
master-bin.000001 # Query 1 # use `test_rpl`; DROP EVENT e2
10821082
master-bin.000001 # Query 1 # BEGIN
10831083
master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Log_name Pos Event_type Server_id End_log_pos Info
213213
master-bin.000001 # Query # # BEGIN
214214
master-bin.000001 # Query # # use `test`; INSERT INTO tt_1(ddl_case) VALUES (26)
215215
master-bin.000001 # Xid # # COMMIT /* XID */
216-
master-bin.000001 # Query # # use `test`; ALTER DEFINER=`root`@`localhost` EVENT evt COMMENT 'evt'
216+
master-bin.000001 # Query # # use `test`; ALTER EVENT evt COMMENT 'evt'
217217
-e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
218218

219219
-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

+8-8
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,9 @@ master-bin.000001 # Query # # use `mysqltest1`; create table t2 like t1
436436
master-bin.000001 # Query # # use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo3`()
437437
DETERMINISTIC
438438
insert into t1 values (15)
439-
master-bin.000001 # Query # # use `mysqltest1`; grant CREATE ROUTINE, EXECUTE on mysqltest1.* to 'zedjzlcsjhd'@'127.0.0.1'
440-
master-bin.000001 # Query # # use `mysqltest1`; grant SELECT on mysqltest1.t1 to 'zedjzlcsjhd'@'127.0.0.1'
441-
master-bin.000001 # Query # # use `mysqltest1`; grant SELECT, INSERT on mysqltest1.t2 to 'zedjzlcsjhd'@'127.0.0.1'
439+
master-bin.000001 # Query # # use `mysqltest1`; grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1
440+
master-bin.000001 # Query # # use `mysqltest1`; grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1
441+
master-bin.000001 # Query # # use `mysqltest1`; grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1
442442
master-bin.000001 # Query # # use `mysqltest1`; CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` PROCEDURE `foo4`()
443443
DETERMINISTIC
444444
begin
@@ -551,7 +551,7 @@ select * from t1
551551
master-bin.000001 # Query # # use `mysqltest1`; drop procedure foo
552552
master-bin.000001 # Query # # use `mysqltest1`; drop function fn1
553553
master-bin.000001 # Query # # drop database mysqltest1
554-
master-bin.000001 # Query # # DROP USER 'zedjzlcsjhd'@'127.0.0.1'
554+
master-bin.000001 # Query # # drop user "zedjzlcsjhd"@127.0.0.1
555555
master-bin.000001 # Query # # use `test`; drop function if exists f1
556556
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
557557
READS SQL DATA
@@ -736,13 +736,13 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `foo3`()
736736
insert into t1 values (15)
737737
/*!*/;
738738
SET TIMESTAMP=t/*!*/;
739-
grant CREATE ROUTINE, EXECUTE on mysqltest1.* to 'zedjzlcsjhd'@'127.0.0.1'
739+
grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1
740740
/*!*/;
741741
SET TIMESTAMP=t/*!*/;
742-
grant SELECT on mysqltest1.t1 to 'zedjzlcsjhd'@'127.0.0.1'
742+
grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1
743743
/*!*/;
744744
SET TIMESTAMP=t/*!*/;
745-
grant SELECT, INSERT on mysqltest1.t2 to 'zedjzlcsjhd'@'127.0.0.1'
745+
grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1
746746
/*!*/;
747747
SET TIMESTAMP=t/*!*/;
748748
CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` PROCEDURE `foo4`()
@@ -1017,7 +1017,7 @@ SET TIMESTAMP=t/*!*/;
10171017
drop database mysqltest1
10181018
/*!*/;
10191019
SET TIMESTAMP=t/*!*/;
1020-
DROP USER 'zedjzlcsjhd'@'127.0.0.1'
1020+
drop user "zedjzlcsjhd"@127.0.0.1
10211021
/*!*/;
10221022
use test/*!*/;
10231023
SET TIMESTAMP=t/*!*/;

0 commit comments

Comments
 (0)