mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse source
This commit is contained in:
Alexander Barkov 2017-04-07 21:02:56 +04:00
commit 329946cacf
2 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
mysql-test/suite/sql_sequence/binlog.result
View file

@ -12,20 +12,19 @@ select next value for s1, min_value from s1 where max_value> 4;
next value for s1 min_value
4 1
drop sequence s1;
"Runnig SHOW BINLOG EVENTS"
include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; create or replace sequence s1 cache 3
# # Gtid 1 # BEGIN GTID #-#-#
# # Annotate_rows 1 # select next value for s1, min_value from s1 where max_value> 1
# # Table_map 1 # table_id: 30 (test.s1)
# # Write_rows_v1 1 # table_id: 30 flags: STMT_END_F
# # Query 1 # COMMIT
# # Gtid 1 # BEGIN GTID #-#-#
# # Annotate_rows 1 # select next value for s1, min_value from s1 where max_value> 4
# # Table_map 1 # table_id: 30 (test.s1)
# # Write_rows_v1 1 # table_id: 30 flags: STMT_END_F
# # Query 1 # COMMIT
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; DROP TABLE `s1` /* generated by server */
RESET MASTER;
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create or replace sequence s1 cache 3
master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Annotate_rows # # select next value for s1, min_value from s1 where max_value> 1
master-bin.000001 # Table_map # # table_id: # (test.s1)
master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Annotate_rows # # select next value for s1, min_value from s1 where max_value> 4
master-bin.000001 # Table_map # # table_id: # (test.s1)
master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `s1` /* generated by server */

16
mysql-test/suite/sql_sequence/binlog.test
View file

@ -6,9 +6,10 @@
# Testing binary logging of sequences
#
--let $pos=`select $binlog_start_pos + 73`
--let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1)
--let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1)
--disable_query_log
reset master; # get rid of previous tests binlog
--enable_query_log
create or replace sequence s1 cache 3;
select next value for s1, min_value from s1 where max_value> 1;
@ -17,10 +18,5 @@ select next value for s1, min_value from s1 where max_value> 3;
select next value for s1, min_value from s1 where max_value> 4;
drop sequence s1;
--echo "Runnig SHOW BINLOG EVENTS"
--replace_column 1 # 2 # 5 #
--replace_regex /xid=[0-9]+/xid=XX/ /GTID [0-9]+-[0-9]+-[0-9]+/GTID #-#-#/ /Server.ver.*/VERSIONS/
--disable_query_log
--eval SHOW BINLOG EVENTS FROM $binlog_start;
--enable_query_log
RESET MASTER;
--let $binlog_file = LAST
source include/show_binlog_events.inc;