Skip to content

M
mariadb
Commit 665a31af authored by unknown's avatar unknown
Browse files
Options

MDEV-26: Global transaction ID. First alpha release. 

Merge of 10.0-mdev26 feature tree into 10.0-base.

Global transaction ID is prepended to each event group in the binlog.

Slave connect can request to start from GTID position instead of specifying
file name/offset of master binlog. This facilitates easy switch to a new
master.

Slave GTID state is stored in a table mysql.rpl_slave_state, which can be
InnoDB to get crash-safe slave state.

GTID includes a replication domain ID, allowing to keep track of distinct
positions for each of multiple masters.
parents 491047a2 e5cbefeb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 16989 additions and 8573 deletions
include/my_dbug.h
View file @ 665a31af
...@@ -89,7 +89,7 @@ extern const char* _db_get_func_(void); ...@@ -89,7 +89,7 @@ extern const char* _db_get_func_(void);
#define DBUG_END() _db_end_ () #define DBUG_END() _db_end_ ()
#define DBUG_LOCK_FILE _db_lock_file_() #define DBUG_LOCK_FILE _db_lock_file_()
#define DBUG_UNLOCK_FILE _db_unlock_file_() #define DBUG_UNLOCK_FILE _db_unlock_file_()
#define DBUG_ASSERT(A) do { _db_flush_(); assert(A); } while(0) #define DBUG_ASSERT(A) assert(A)
#define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len)) #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))
#define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len)) #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))
#define DEBUGGER_OFF do { _dbug_on_= 0; } while(0) #define DEBUGGER_OFF do { _dbug_on_= 0; } while(0)
......
libmysqld/CMakeLists.txt
View file @ 665a31af
...@@ -98,6 +98,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ...@@ -98,6 +98,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
../sql/rpl_reporting.cc ../sql/rpl_reporting.cc
../sql/sql_expression_cache.cc ../sql/sql_expression_cache.cc
../sql/my_apc.cc ../sql/my_apc.h ../sql/my_apc.cc ../sql/my_apc.h
../sql/rpl_gtid.cc
${GEN_SOURCES} ${GEN_SOURCES}
${MYSYS_LIBWRAP_SOURCE} ${MYSYS_LIBWRAP_SOURCE}
) )
......
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
View file @ 665a31af
...@@ -318,8 +318,8 @@ connection con4; ...@@ -318,8 +318,8 @@ connection con4;
select get_lock("a",10); # wait for rollback to finish select get_lock("a",10); # wait for rollback to finish
if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`) if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`)
{ {
--let $binlog_rollback= query_get_value(SHOW BINLOG EVENTS, Pos, 8) --let $binlog_rollback= query_get_value(SHOW BINLOG EVENTS, Pos, 11)
--let $binlog_query= query_get_value(SHOW BINLOG EVENTS, Info, 8) --let $binlog_query= query_get_value(SHOW BINLOG EVENTS, Info, 11)
if ($binlog_query != ROLLBACK) { if ($binlog_query != ROLLBACK) {
--echo Wrong query from SHOW BINLOG EVENTS. Expected ROLLBACK, got '$binlog_query' --echo Wrong query from SHOW BINLOG EVENTS. Expected ROLLBACK, got '$binlog_query'
--source include/show_rpl_debug_info.inc --source include/show_rpl_debug_info.inc
......
mysql-test/extra/rpl_tests/create_recursive_construct.inc
View file @ 665a31af
...@@ -325,8 +325,8 @@ if ($CRC_RET_stmt_sidef) { ...@@ -325,8 +325,8 @@ if ($CRC_RET_stmt_sidef) {
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
--die Wrong number of warnings. --die Wrong number of warnings.
} }
# There should be no events after format description and binlog checkpoint. # There should be no events after format description, Gtid list, and binlog checkpoint.
--let $binlog_event= query_get_value(SHOW BINLOG EVENTS, Event_type, 3) --let $binlog_event= query_get_value(SHOW BINLOG EVENTS, Event_type, 4)
if ($binlog_event != No such row) { if ($binlog_event != No such row) {
--enable_query_log --enable_query_log
--echo ******** Failure! Something was written to the binlog despite SQL_LOG_BIN=0 ******** --echo ******** Failure! Something was written to the binlog despite SQL_LOG_BIN=0 ********
...@@ -346,14 +346,14 @@ if ($CRC_RET_stmt_sidef) { ...@@ -346,14 +346,14 @@ if ($CRC_RET_stmt_sidef) {
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
--die Warnings printed --die Warnings printed
} }
--let $event_type= query_get_value(SHOW BINLOG EVENTS, Event_type, 4) --let $event_type= query_get_value(SHOW BINLOG EVENTS, Event_type, 5)
# The first event is format_description, the second is Binlog_checkpoint, # The first event is format_description, the second is Gtid list, the
# the third Query_event('BEGIN'), and the fourth should be our Query # third is Binlog_checkpoint, the fourth Gtid, and the fifth should be
# for 'INSERT DELAYED' unsafe_type 3, which is safe after # our Query for 'INSERT DELAYED' unsafe_type 3, which is safe after
# the fix of bug#54579. # the fix of bug#54579.
if (`SELECT $unsafe_type = 3 AND '$event_type' != 'Query'`) { if (`SELECT $unsafe_type = 3 AND '$event_type' != 'Query'`) {
--enable_query_log --enable_query_log
--echo ******** Failure! Event number 4 was a '$event_type', not a 'Query'. ******** --echo ******** Failure! Event number 5 was a '$event_type', not a 'Query'. ********
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
--die Wrong events in binlog. --die Wrong events in binlog.
} }
......
mysql-test/extra/rpl_tests/rpl_deadlock.test
View file @ 665a31af
...@@ -34,7 +34,7 @@ INSERT INTO t3 VALUES (3); ...@@ -34,7 +34,7 @@ INSERT INTO t3 VALUES (3);
COMMIT; COMMIT;
save_master_pos; save_master_pos;
# Save BEGIN event into variable # Save BEGIN event into variable
let $master_pos_begin= query_get_value(SHOW BINLOG EVENTS, Pos, 6); let $master_pos_begin= query_get_value(SHOW BINLOG EVENTS, Pos, 10);
--echo --echo
# 1) Test deadlock # 1) Test deadlock
......
mysql-test/extra/rpl_tests/rpl_insert_delayed.test
View file @ 665a31af
...@@ -137,7 +137,10 @@ if (`SELECT @@global.binlog_format = 'STATEMENT'`) ...@@ -137,7 +137,10 @@ if (`SELECT @@global.binlog_format = 'STATEMENT'`)
{ {
#must show two INSERT DELAYED #must show two INSERT DELAYED
--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1) --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
--let $binlog_limit= 2,6 # The show_binlog_events.inc already skips format_description, gtid list, and
# one binlog checkpoint events. Skip three more, second binlog checkpoint,
# Gtid, and CREATE TABLE, so we start at the first DML event
--let $binlog_limit= 3,6
--source include/show_binlog_events.inc --source include/show_binlog_events.inc
} }
select * from t1; select * from t1;
......
mysql-test/extra/rpl_tests/rpl_log.test
View file @ 665a31af
...@@ -33,13 +33,13 @@ eval load data infile '$LOAD_FILE' into table t1 ignore 1 lines; ...@@ -33,13 +33,13 @@ eval load data infile '$LOAD_FILE' into table t1 ignore 1 lines;
select count(*) from t1; select count(*) from t1;
source include/show_binlog_events.inc; source include/show_binlog_events.inc;
let $binlog_limit= 1; let $binlog_limit= 2;
source include/show_binlog_events.inc; source include/show_binlog_events.inc;
let $binlog_limit= 2; let $binlog_limit= 3;
source include/show_binlog_events.inc; source include/show_binlog_events.inc;
let $binlog_limit= 1,4; let $binlog_limit= 2,4;
source include/show_binlog_events.inc; source include/show_binlog_events.inc;
let $binlog_limit=; let $binlog_limit=;
flush logs; flush logs;
......
mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc
View file @ 665a31af
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
--let $binlog_limit= --let $binlog_limit=
--source extra/rpl_tests/rpl_show_binlog_events.inc --source extra/rpl_tests/rpl_show_binlog_events.inc
--let $binlog_limit= 1 --let $binlog_limit= 2
--source extra/rpl_tests/rpl_show_binlog_events.inc --source extra/rpl_tests/rpl_show_binlog_events.inc
--let $binlog_limit= 1,3 --let $binlog_limit= 2,3
--source extra/rpl_tests/rpl_show_binlog_events.inc --source extra/rpl_tests/rpl_show_binlog_events.inc
--let $binlog_limit= --let $binlog_limit=
--let $binlog_file= --let $binlog_file=
......
mysql-test/include/binlog_start_pos.inc
View file @ 665a31af
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
# 1 /* Checksum algorithm */ + # 1 /* Checksum algorithm */ +
# 4 /* CRC32 length */ # 4 /* CRC32 length */
# #
# With current number of events = 161, # With current number of events = 163,
# #
# binlog_start_pos = 4 + 19 + 57 + 161 + 1 + 4 = 246. # binlog_start_pos = 4 + 19 + 57 + 163 + 1 + 4 = 248.
# #
############################################################################## ##############################################################################
let $binlog_start_pos=246; let $binlog_start_pos=248;
--disable_query_log --disable_query_log
SET @binlog_start_pos=246; SET @binlog_start_pos=248;
--enable_query_log --enable_query_log
mysql-test/include/check-testcase.test
View file @ 665a31af
...@@ -60,6 +60,7 @@ if ($tmp) ...@@ -60,6 +60,7 @@ if ($tmp)
--echo Last_SQL_Error --echo Last_SQL_Error
--echo Replicate_Ignore_Server_Ids --echo Replicate_Ignore_Server_Ids
--echo Master_Server_Id # --echo Master_Server_Id #
--echo Using_Gtid 0
} }
if (!$tmp) { if (!$tmp) {
# Note: after WL#5177, fields 13-18 shall not be filtered-out. # Note: after WL#5177, fields 13-18 shall not be filtered-out.
......
mysql-test/include/mtr_check.sql
View file @ 665a31af
...@@ -31,6 +31,7 @@ BEGIN ...@@ -31,6 +31,7 @@ BEGIN
AND variable_name not like "Last_IO_Err*" AND variable_name not like "Last_IO_Err*"
AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_IBUF_MAX_SIZE'
AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_USE_NATIVE_AIO'
AND variable_name != 'GTID_POS'
ORDER BY variable_name; ORDER BY variable_name;
-- Dump all databases, there should be none -- Dump all databases, there should be none
......
mysql-test/include/rpl_end.inc
View file @ 665a31af
...@@ -79,6 +79,22 @@ while ($_rpl_server) ...@@ -79,6 +79,22 @@ while ($_rpl_server)
--source include/rpl_sync.inc --source include/rpl_sync.inc
--source include/rpl_stop_slaves.inc --source include/rpl_stop_slaves.inc
if (!$rpl_debug)
{
--disable_query_log
}
--let $_rpl_server= $rpl_server_count
while ($_rpl_server)
{
--let $rpl_connection_name= server_$_rpl_server
--source include/rpl_connection.inc
# Clear Using_Gtid in SHOW SLAVE STATUS to keep check_testcase happy.
CHANGE MASTER TO master_log_file='';
--dec $_rpl_server
}
# mtr configures server 2 to be a slave before it runs the test. We # mtr configures server 2 to be a slave before it runs the test. We
# have to restore that state now, so we change topology to 1->2. # have to restore that state now, so we change topology to 1->2.
--let $rpl_topology= none --let $rpl_topology= none
......
mysql-test/include/show_binlog_events2.inc
View file @ 665a31af
--let $binlog_start=246 --let $binlog_start=248
--replace_result $binlog_start <binlog_start> --replace_result $binlog_start <binlog_start>
--replace_column 2 # 5 # --replace_column 2 # 5 #
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /GTID [0-9]+-[0-9]+-[0-9]+/GTID #-#-#/
--eval show binlog events from $binlog_start --eval show binlog events from $binlog_start
mysql-test/include/show_events.inc
View file @ 665a31af
...@@ -9,23 +9,6 @@ if ($binlog_start) ...@@ -9,23 +9,6 @@ if ($binlog_start)
{ {
--let $_binlog_start= $binlog_start --let $_binlog_start= $binlog_start
} }
if (!$binlog_start)
{
# If $binlog_start is not set, we will set it as the third event's
# position (second in relay log which has not Binlog Checkpoing event).
# The first two events (Description Event and Binlog Checkpoint
# event) are always ignored. For description event's length might be changed
# because of adding new events, 'SHOW BINLOG EVENTS LIMIT 2' is used to get
# the right value.
if ($is_relay_log)
{
--let $_binlog_start= query_get_value(SHOW BINLOG EVENTS LIMIT 1, End_log_pos, 1)
}
if (!$is_relay_log)
{
--let $_binlog_start= query_get_value(SHOW BINLOG EVENTS LIMIT 2, End_log_pos, 2)
}
}
--let $_statement=show binlog events --let $_statement=show binlog events
if ($is_relay_log) if ($is_relay_log)
...@@ -38,6 +21,25 @@ if ($binlog_file) ...@@ -38,6 +21,25 @@ if ($binlog_file)
--let $_statement= $_statement in '$binlog_file' --let $_statement= $_statement in '$binlog_file'
} }
if (!$binlog_start)
{
# If $binlog_start is not set, we will set it as the fourth event's
# position (second in relay log which has not Binlog Checkpoing nor
# Gtid_list events).
# The first three events (Description Event, Gtid list, and Binlog Checkpoint
# event) are always ignored. For description event's length might be changed
# because of adding new events, 'SHOW BINLOG EVENTS LIMIT 3' is used to get
# the right value.
if ($is_relay_log)
{
--let $_binlog_start= query_get_value($_statement LIMIT 1, End_log_pos, 1)
}
if (!$is_relay_log)
{
--let $_binlog_start= query_get_value($_statement LIMIT 3, End_log_pos, 3)
}
}
--let $_statement= $_statement from $_binlog_start --let $_statement= $_statement from $_binlog_start
# Cannot use if($binlog_limit) since the variable may begin with a 0 # Cannot use if($binlog_limit) since the variable may begin with a 0
...@@ -49,5 +51,5 @@ if (`SELECT '$binlog_limit' <> ''`) ...@@ -49,5 +51,5 @@ if (`SELECT '$binlog_limit' <> ''`)
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $_binlog_start <binlog_start> --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $_binlog_start <binlog_start>
--replace_column 2 # 4 # 5 # --replace_column 2 # 4 # 5 #
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/ --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/ /GTID [0-9]+-[0-9]+-[0-9]+/GTID #-#-#/ /\[([0-9]-[0-9]-[0-9]+)\]/[#-#-#]/
--eval $_statement --eval $_statement
mysql-test/include/wait_for_purge.inc 0 → 100644
View file @ 665a31af
# include/wait_for_purge.inc
#
# SUMMARY
#
# Repeatedly attempt to purge binlogs up to a specific point, until
# SHOW BINARY LOGS shows it has succeeded.
# This can be useful to avoid races where slaves are stopped but the
# corresponding binlog dump thread on the master has not yet terminated.
# Async binlog checkpoints can also delay purge.
#
# Note that it may be necessary to inject at least one event in the binlog
# after stopping slaves, or master may not detect stop of slave for a long
# time (or forever), depending on details of test case, if replication
# heartbeat is enabled, etc.
#
# USAGE:
#
# --let $purge_binlogs_to=master-bin.000003
# --source include/wait_for_purge.inc
#
# SIDE EFFECTS:
#
# Disables --query_log while running, enables it afterwards.
--echo include/wait_for_purge.inc "$purge_binlogs_to"
let $_wait_count= 300;
let $_done= 0;
--disable_query_log
while ($_wait_count)
{
dec $_wait_count;
eval PURGE BINARY LOGS TO "$purge_binlogs_to";
let $_cur_binlog= query_get_value(SHOW BINARY LOGS, Log_name, 1);
if (`SELECT "$_cur_binlog" = "$purge_binlogs_to"`)
{
let $_done= 1;
let $_wait_count= 0;
}
if ($_wait_count)
{
real_sleep 0.1;
}
}
if (!$_done)
{
SHOW FULL PROCESSLIST;
eval SHOW BINARY LOGS;
--die ERROR: failed while waiting for binlog purge to $purge_binlogs_to
}
--enable_query_log
mysql-test/r/1st.result
View file @ 665a31af
...@@ -24,6 +24,7 @@ plugin ...@@ -24,6 +24,7 @@ plugin
proc proc
procs_priv procs_priv
proxies_priv proxies_priv
rpl_slave_state
servers servers
slow_log slow_log
table_stats table_stats
......
mysql-test/r/alter_table-big.result
View file @ 665a31af
...@@ -16,11 +16,12 @@ insert into t1 values (1, 1, 1);; ...@@ -16,11 +16,12 @@ insert into t1 values (1, 1, 1);;
set debug_sync='now SIGNAL go'; set debug_sync='now SIGNAL go';
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t2 values (1) master-bin.000001 # Query # # use `test`; insert into t2 values (1)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; alter table t1 enable keys master-bin.000001 # Query # # use `test`; alter table t1 enable keys
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t1 values (1, 1, 1) master-bin.000001 # Query # # use `test`; insert into t1 values (1, 1, 1)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
drop tables t1, t2; drop tables t1, t2;
...@@ -59,19 +60,28 @@ set debug_sync='alter_table_before_main_binlog SIGNAL parked WAIT_FOR go'; ...@@ -59,19 +60,28 @@ set debug_sync='alter_table_before_main_binlog SIGNAL parked WAIT_FOR go';
set debug_sync='RESET'; set debug_sync='RESET';
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; alter table t1 change i c char(10) default 'Test1' master-bin.000001 # Query # # use `test`; alter table t1 change i c char(10) default 'Test1'
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t1 values () master-bin.000001 # Query # # use `test`; insert into t1 values ()
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; alter table t1 change c vc varchar(100) default 'Test2' master-bin.000001 # Query # # use `test`; alter table t1 change c vc varchar(100) default 'Test2'
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; rename table t1 to t2 master-bin.000001 # Query # # use `test`; rename table t1 to t2
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create table t1 (i int) master-bin.000001 # Query # # use `test`; create table t1 (i int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; alter table t1 change i c char(10) default 'Test3', rename to t2 master-bin.000001 # Query # # use `test`; alter table t1 change i c char(10) default 'Test3', rename to t2
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t2 values() master-bin.000001 # Query # # use `test`; insert into t2 values()
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; alter table t2 change c vc varchar(100) default 'Test2', rename to t1 master-bin.000001 # Query # # use `test`; alter table t2 change c vc varchar(100) default 'Test2', rename to t1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; rename table t1 to t3 master-bin.000001 # Query # # use `test`; rename table t1 to t3
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t3` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t3` /* generated by server */
End of 5.1 tests End of 5.1 tests
mysql-test/r/connect.result
View file @ 665a31af
...@@ -18,6 +18,7 @@ plugin ...@@ -18,6 +18,7 @@ plugin
proc proc
procs_priv procs_priv
proxies_priv proxies_priv
rpl_slave_state
servers servers
slow_log slow_log
table_stats table_stats
...@@ -55,6 +56,7 @@ plugin ...@@ -55,6 +56,7 @@ plugin
proc proc
procs_priv procs_priv
proxies_priv proxies_priv
rpl_slave_state
servers servers
slow_log slow_log
table_stats table_stats
...@@ -100,6 +102,7 @@ plugin ...@@ -100,6 +102,7 @@ plugin
proc proc
procs_priv procs_priv
proxies_priv proxies_priv
rpl_slave_state
servers servers
slow_log slow_log
table_stats table_stats
......
mysql-test/r/create-big.result
View file @ 665a31af
...@@ -188,11 +188,14 @@ t2 CREATE TABLE `t2` ( ...@@ -188,11 +188,14 @@ t2 CREATE TABLE `t2` (
drop table t2; drop table t2;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t1 values (1) master-bin.000001 # Query # # use `test`; insert into t1 values (1)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create table t2 like t1 master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
create table t1 (i int); create table t1 (i int);
set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go'; set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
...@@ -216,13 +219,20 @@ drop table t2; ...@@ -216,13 +219,20 @@ drop table t2;
set debug_sync='RESET'; set debug_sync='RESET';
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create table t2 like t1 master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t2 values (1) master-bin.000001 # Query # # use `test`; insert into t2 values (1)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create table t2 like t1 master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create table t2 like t1 master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
mysql-test/r/ctype_cp932_binlog_row.result
View file @ 665a31af
...@@ -8,8 +8,9 @@ SET @var1= x'8300'; ...@@ -8,8 +8,9 @@ SET @var1= x'8300';
EXECUTE stmt1 USING @var1; EXECUTE stmt1 USING @var1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1(f1 blob) master-bin.000001 # Query # # use `test`; CREATE TABLE t1(f1 blob)
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
......
mysql-test/r/ctype_cp932_binlog_stm.result
View file @ 665a31af
...@@ -8,8 +8,9 @@ SET @var1= x'8300'; ...@@ -8,8 +8,9 @@ SET @var1= x'8300';
EXECUTE stmt1 USING @var1; EXECUTE stmt1 USING @var1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1(f1 blob) master-bin.000001 # Query # # use `test`; CREATE TABLE t1(f1 blob)
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(0x8300) master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(0x8300)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
SELECT HEX(f1) FROM t1; SELECT HEX(f1) FROM t1;
...@@ -34,19 +35,23 @@ DROP PROCEDURE bug18293| ...@@ -34,19 +35,23 @@ DROP PROCEDURE bug18293|
DROP TABLE t4| DROP TABLE t4|
show binlog events from <binlog_start>| show binlog events from <binlog_start>|
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1, master-bin.000001 # Query # # use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
s2 CHAR(50) CHARACTER SET cp932, s2 CHAR(50) CHARACTER SET cp932,
d DECIMAL(10,2)) d DECIMAL(10,2))
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50), master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50),
IN ins2 CHAR(50) CHARACTER SET cp932, IN ins2 CHAR(50) CHARACTER SET cp932,
IN ind DECIMAL(10,2)) IN ind DECIMAL(10,2))
BEGIN BEGIN
INSERT INTO t4 VALUES (ins1, ins2, ind); INSERT INTO t4 VALUES (ins1, ins2, ind);
END END
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172 COLLATE 'latin1_swedish_ci'), NAME_CONST('ins2',_cp932 0xED40ED41ED42 COLLATE 'cp932_japanese_ci'), NAME_CONST('ind',47.93)) master-bin.000001 # Query # # use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172 COLLATE 'latin1_swedish_ci'), NAME_CONST('ins2',_cp932 0xED40ED41ED42 COLLATE 'cp932_japanese_ci'), NAME_CONST('ind',47.93))
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP PROCEDURE bug18293 master-bin.000001 # Query # # use `test`; DROP PROCEDURE bug18293
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t4` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t4` /* generated by server */
End of 5.0 tests End of 5.0 tests
call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Found invalid"); call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Found invalid");
......
mysql-test/r/information_schema.result
View file @ 665a31af
...@@ -98,6 +98,7 @@ plugin ...@@ -98,6 +98,7 @@ plugin
proc proc
procs_priv procs_priv
proxies_priv proxies_priv
rpl_slave_state
servers servers
slow_log slow_log
t1 t1
......
mysql-test/r/information_schema_all_engines.result
View file @ 665a31af
...@@ -424,4 +424,4 @@ Wildcard: inf_rmation_schema ...@@ -424,4 +424,4 @@ Wildcard: inf_rmation_schema
SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA; SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
table_schema count(*) table_schema count(*)
information_schema 59 information_schema 59
mysql 26 mysql 27
mysql-test/r/log_tables_upgrade.result
View file @ 665a31af
...@@ -36,6 +36,7 @@ mysql.proc OK ...@@ -36,6 +36,7 @@ mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.renamed_general_log OK mysql.renamed_general_log OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
......
mysql-test/r/multi_update.result
View file @ 665a31af
...@@ -605,7 +605,7 @@ a b ...@@ -605,7 +605,7 @@ a b
4 4 4 4
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t2) master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
...@@ -618,7 +618,7 @@ UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; ...@@ -618,7 +618,7 @@ UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a;
ERROR 23000: Duplicate entry '4' for key 'PRIMARY' ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t2) master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
......
mysql-test/r/mysql_upgrade.result
View file @ 665a31af
...@@ -23,6 +23,7 @@ mysql.plugin OK ...@@ -23,6 +23,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
...@@ -63,6 +64,7 @@ mysql.plugin OK ...@@ -63,6 +64,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
...@@ -103,6 +105,7 @@ mysql.plugin OK ...@@ -103,6 +105,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
...@@ -146,6 +149,7 @@ mysql.plugin OK ...@@ -146,6 +149,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
...@@ -192,6 +196,7 @@ mysql.plugin OK ...@@ -192,6 +196,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
...@@ -241,6 +246,7 @@ mysql.plugin OK ...@@ -241,6 +246,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
...@@ -293,6 +299,7 @@ mysql.plugin OK ...@@ -293,6 +299,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
......
mysql-test/r/mysql_upgrade_ssl.result
View file @ 665a31af
...@@ -25,6 +25,7 @@ mysql.plugin OK ...@@ -25,6 +25,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
......
mysql-test/r/mysqlbinlog-innodb.result
View file @ 665a31af
...@@ -24,6 +24,9 @@ FLUSH LOGS; ...@@ -24,6 +24,9 @@ FLUSH LOGS;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/; DELIMITER /*!*/;
ROLLBACK/*!*/; ROLLBACK/*!*/;
BEGIN
/*!*/;
use `test`/*!*/;
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
...@@ -33,14 +36,9 @@ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/ ...@@ -33,14 +36,9 @@ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
SET @@session.lc_time_names=0/*!*/; SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/; SET @@session.collation_database=DEFAULT/*!*/;
BEGIN
/*!*/;
use `test`/*!*/;
SET TIMESTAMP=1000000000/*!*/;
INSERT INTO t1 VALUES (1) INSERT INTO t1 VALUES (1)
/*!*/; /*!*/;
COMMIT/*!*/; COMMIT/*!*/;
SET TIMESTAMP=1000000000/*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
...@@ -57,6 +55,9 @@ ROLLBACK /* added by mysqlbinlog */; ...@@ -57,6 +55,9 @@ ROLLBACK /* added by mysqlbinlog */;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/; DELIMITER /*!*/;
ROLLBACK/*!*/; ROLLBACK/*!*/;
BEGIN
/*!*/;
use `foo`/*!*/;
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
...@@ -66,14 +67,9 @@ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/ ...@@ -66,14 +67,9 @@ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
SET @@session.lc_time_names=0/*!*/; SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/; SET @@session.collation_database=DEFAULT/*!*/;
BEGIN
/*!*/;
use `foo`/*!*/;
SET TIMESTAMP=1000000000/*!*/;
INSERT INTO t1 VALUES (1) INSERT INTO t1 VALUES (1)
/*!*/; /*!*/;
COMMIT/*!*/; COMMIT/*!*/;
SET TIMESTAMP=1000000000/*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
......
mysql-test/r/mysqlbinlog.result
View file @ 665a31af
This diff is collapsed.
mysql-test/r/mysqlcheck.result
View file @ 665a31af
...@@ -19,6 +19,7 @@ mysql.plugin OK ...@@ -19,6 +19,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
...@@ -46,6 +47,7 @@ mysql.plugin OK ...@@ -46,6 +47,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
...@@ -71,6 +73,7 @@ mysql.plugin OK ...@@ -71,6 +73,7 @@ mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.proxies_priv OK mysql.proxies_priv OK
mysql.rpl_slave_state OK
mysql.servers OK mysql.servers OK
mysql.table_stats OK mysql.table_stats OK
mysql.tables_priv OK mysql.tables_priv OK
...@@ -96,6 +99,7 @@ mysql.plugin Table is already up to date ...@@ -96,6 +99,7 @@ mysql.plugin Table is already up to date
mysql.proc Table is already up to date mysql.proc Table is already up to date
mysql.procs_priv Table is already up to date mysql.procs_priv Table is already up to date
mysql.proxies_priv Table is already up to date mysql.proxies_priv Table is already up to date
mysql.rpl_slave_state Table is already up to date
mysql.servers Table is already up to date mysql.servers Table is already up to date
mysql.table_stats Table is already up to date mysql.table_stats Table is already up to date
mysql.tables_priv Table is already up to date mysql.tables_priv Table is already up to date
......
mysql-test/r/mysqld--help.result
View file @ 665a31af
...@@ -201,6 +201,12 @@ The following options may be given as the first argument: ...@@ -201,6 +201,12 @@ The following options may be given as the first argument:
--group-concat-max-len=# --group-concat-max-len=#
The maximum length of the result of function The maximum length of the result of function
GROUP_CONCAT() GROUP_CONCAT()
--gtid-domain-id=# Used with global transaction ID to identify logically
independent replication streams. When events can
propagate through multiple parallel paths (for example
multiple masters), each independent source server must
use a distinct domain_id. For simple tree-shaped
replication topologies, it can be left at its default, 0.
-?, --help Display this help and exit. -?, --help Display this help and exit.
--ignore-builtin-innodb --ignore-builtin-innodb
Disable initialization of builtin InnoDB plugin Disable initialization of builtin InnoDB plugin
...@@ -932,6 +938,7 @@ ft-stopword-file (No default value) ...@@ -932,6 +938,7 @@ ft-stopword-file (No default value)
gdb FALSE gdb FALSE
general-log FALSE general-log FALSE
group-concat-max-len 1024 group-concat-max-len 1024
gtid-domain-id 0
help TRUE help TRUE
ignore-builtin-innodb FALSE ignore-builtin-innodb FALSE
ignore-db-dirs ignore-db-dirs
......
mysql-test/r/mysqldump-max.result
View file @ 665a31af
...@@ -334,10 +334,10 @@ DROP TABLE t1; ...@@ -334,10 +334,10 @@ DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
SHOW BINLOG EVENTS LIMIT 7,3; SHOW BINLOG EVENTS LIMIT 7,3;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 704 Query 1 772 BEGIN master-bin.000001 591 Xid 1 618 COMMIT /* XID */
master-bin.000001 772 Query 1 869 use `test`; INSERT INTO t2 VALUES (1,0), (2,0) master-bin.000001 618 Gtid 1 656 GTID 0-1-3
master-bin.000001 869 Xid 1 896 COMMIT /* XID */ master-bin.000001 656 Query 1 775 use `test`; CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB
-- CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=896; -- CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=937;
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
a a
1 1
......
mysql-test/r/partition_binlog.result
View file @ 665a31af
...@@ -41,9 +41,14 @@ ALTER TABLE t1 TRUNCATE PARTITION p0; ...@@ -41,9 +41,14 @@ ALTER TABLE t1 TRUNCATE PARTITION p0;
ALTER TABLE t1 DROP PARTITION p0; ALTER TABLE t1 DROP PARTITION p0;
show binlog events in 'master-bin.000001' from <binlog_start>; show binlog events in 'master-bin.000001' from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; ALTER TABLE t1 ANALYZE PARTITION p0 master-bin.000001 # Query # # use `test`; ALTER TABLE t1 ANALYZE PARTITION p0
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; ALTER TABLE t1 OPTIMIZE PARTITION p0 master-bin.000001 # Query # # use `test`; ALTER TABLE t1 OPTIMIZE PARTITION p0
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; ALTER TABLE t1 REPAIR PARTITION p0 master-bin.000001 # Query # # use `test`; ALTER TABLE t1 REPAIR PARTITION p0
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; ALTER TABLE t1 TRUNCATE PARTITION p0 master-bin.000001 # Query # # use `test`; ALTER TABLE t1 TRUNCATE PARTITION p0
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; ALTER TABLE t1 DROP PARTITION p0 master-bin.000001 # Query # # use `test`; ALTER TABLE t1 DROP PARTITION p0
DROP TABLE t1; DROP TABLE t1;
mysql-test/r/sp_trans_log.result
View file @ 665a31af
...@@ -16,7 +16,7 @@ insert into t2 values (bug23333(),1)| ...@@ -16,7 +16,7 @@ insert into t2 values (bug23333(),1)|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY' ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
show binlog events from <binlog_start> limit 0, 4| show binlog events from <binlog_start> limit 0, 4|
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
......
mysql-test/r/stat_tables_rbr.result
View file @ 665a31af
...@@ -15,12 +15,18 @@ Table Op Msg_type Msg_text ...@@ -15,12 +15,18 @@ Table Op Msg_type Msg_text
test.t1 analyze status OK test.t1 analyze status OK
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 246 Server ver: #, Binlog ver: # master-bin.000001 4 Format_desc 1 248 Server ver: #, Binlog ver: #
master-bin.000001 246 Binlog_checkpoint 1 286 master-bin.000001 master-bin.000001 248 Gtid_list 1 271 []
master-bin.000001 286 Query 1 386 use `test`; CREATE TABLE t1 (i INT) ENGINE=InnoDB master-bin.000001 271 Binlog_checkpoint 1 311 master-bin.000001
master-bin.000001 386 Query 1 465 use `test`; ANALYZE TABLE t1 master-bin.000001 311 Gtid 1 349 GTID 0-1-1
master-bin.000001 465 Query 1 569 use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 349 Query 1 449 use `test`; CREATE TABLE t1 (i INT) ENGINE=InnoDB
master-bin.000001 569 Query 1 705 use `test`; CREATE TABLE t1 ( a INT ) ENGINE=MyISAM PARTITION BY HASH(a) PARTITIONS 2 master-bin.000001 449 Gtid 1 487 GTID 0-1-2
master-bin.000001 705 Query 1 803 use `test`; ALTER TABLE t1 ANALYZE PARTITION p1 master-bin.000001 487 Query 1 566 use `test`; ANALYZE TABLE t1
master-bin.000001 566 Gtid 1 604 GTID 0-1-3
master-bin.000001 604 Query 1 708 use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 708 Gtid 1 746 GTID 0-1-4
master-bin.000001 746 Query 1 882 use `test`; CREATE TABLE t1 ( a INT ) ENGINE=MyISAM PARTITION BY HASH(a) PARTITIONS 2
master-bin.000001 882 Gtid 1 920 GTID 0-1-5
master-bin.000001 920 Query 1 1018 use `test`; ALTER TABLE t1 ANALYZE PARTITION p1
SET use_stat_tables = DEFAULT; SET use_stat_tables = DEFAULT;
DROP TABLE t1; DROP TABLE t1;
mysql-test/r/system_mysql_db.result
View file @ 665a31af
...@@ -17,6 +17,7 @@ plugin ...@@ -17,6 +17,7 @@ plugin
proc proc
procs_priv procs_priv
proxies_priv proxies_priv
rpl_slave_state
servers servers
slow_log slow_log
table_stats table_stats
......
mysql-test/r/system_mysql_db_fix40123.result
View file @ 665a31af
...@@ -17,6 +17,7 @@ plugin ...@@ -17,6 +17,7 @@ plugin
proc proc
procs_priv procs_priv
proxies_priv proxies_priv
rpl_slave_state
servers servers
slow_log slow_log
table_stats table_stats
......
mysql-test/r/system_mysql_db_fix50030.result
View file @ 665a31af
...@@ -17,6 +17,7 @@ plugin ...@@ -17,6 +17,7 @@ plugin
proc proc
procs_priv procs_priv
proxies_priv proxies_priv
rpl_slave_state
servers servers
slow_log slow_log
table_stats table_stats
......
mysql-test/r/system_mysql_db_fix50117.result
View file @ 665a31af
...@@ -17,6 +17,7 @@ plugin ...@@ -17,6 +17,7 @@ plugin
proc proc
procs_priv procs_priv
proxies_priv proxies_priv
rpl_slave_state
servers servers
slow_log slow_log
table_stats table_stats
......
mysql-test/r/user_var-binlog.result
View file @ 665a31af
...@@ -8,11 +8,11 @@ SET @var2=char(ascii('a')); ...@@ -8,11 +8,11 @@ SET @var2=char(ascii('a'));
insert into t1 values (@var1),(@var2); insert into t1 values (@var1),(@var2);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # User var # # @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci master-bin.000001 # User var # # @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(@`a b`) master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(@`a b`)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # User var # # @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci master-bin.000001 # User var # # @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
master-bin.000001 # User var # # @`var2`=_binary 0x61 COLLATE binary master-bin.000001 # User var # # @`var2`=_binary 0x61 COLLATE binary
master-bin.000001 # Query # # use `test`; insert into t1 values (@var1),(@var2) master-bin.000001 # Query # # use `test`; insert into t1 values (@var1),(@var2)
...@@ -23,6 +23,10 @@ flush logs; ...@@ -23,6 +23,10 @@ flush logs;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/; DELIMITER /*!*/;
ROLLBACK/*!*/; ROLLBACK/*!*/;
BEGIN
/*!*/;
SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`/*!*/;
use `test`/*!*/;
SET TIMESTAMP=10000/*!*/; SET TIMESTAMP=10000/*!*/;
SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
...@@ -32,17 +36,11 @@ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/ ...@@ -32,17 +36,11 @@ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
SET @@session.lc_time_names=0/*!*/; SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/; SET @@session.collation_database=DEFAULT/*!*/;
BEGIN
/*!*/;
SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`/*!*/;
use `test`/*!*/;
SET TIMESTAMP=10000/*!*/;
INSERT INTO t1 VALUES(@`a b`) INSERT INTO t1 VALUES(@`a b`)
/*!*/; /*!*/;
SET TIMESTAMP=10000/*!*/; SET TIMESTAMP=10000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
SET TIMESTAMP=10000/*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`/*!*/; SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`/*!*/;
......
mysql-test/r/xa_binlog.result
View file @ 665a31af
...@@ -18,15 +18,15 @@ a ...@@ -18,15 +18,15 @@ a
1 1
2 2
3 3
SHOW BINLOG EVENTS LIMIT 2,9; SHOW BINLOG EVENTS LIMIT 3,9;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # BEGIN master-bin.000001 # Gtid 1 # BEGIN GTID #-#-#
master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES (1) master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES (1)
master-bin.000001 # Query 1 # COMMIT master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # BEGIN master-bin.000001 # Gtid 1 # BEGIN GTID #-#-#
master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES (2) master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES (2)
master-bin.000001 # Query 1 # COMMIT master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # BEGIN master-bin.000001 # Gtid 1 # BEGIN GTID #-#-#
master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES (3) master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES (3)
master-bin.000001 # Xid 1 # COMMIT /* xid=XX */ master-bin.000001 # Xid 1 # COMMIT /* xid=XX */
DROP TABLE t1; DROP TABLE t1;
mysql-test/suite/binlog/r/binlog_checkpoint.result
View file @ 665a31af
...@@ -20,6 +20,7 @@ master-bin.000004 # ...@@ -20,6 +20,7 @@ master-bin.000004 #
show binlog events in 'master-bin.00000<binlog_start>' from <binlog_start>; show binlog events in 'master-bin.00000<binlog_start>' from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.00000<binlog_start> # Format_desc # # SERVER_VERSION, BINLOG_VERSION master-bin.00000<binlog_start> # Format_desc # # SERVER_VERSION, BINLOG_VERSION
master-bin.00000<binlog_start> # Gtid_list # # [#-#-#]
master-bin.00000<binlog_start> # Binlog_checkpoint # # master-bin.000001 master-bin.00000<binlog_start> # Binlog_checkpoint # # master-bin.000001
SET DEBUG_SYNC= "execute_command_after_close_tables SIGNAL reset_master_done"; SET DEBUG_SYNC= "execute_command_after_close_tables SIGNAL reset_master_done";
RESET MASTER; RESET MASTER;
...@@ -34,6 +35,7 @@ master-bin.000001 # ...@@ -34,6 +35,7 @@ master-bin.000001 #
show binlog events in 'master-bin.000001' from <binlog_start>; show binlog events in 'master-bin.000001' from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc # # SERVER_VERSION, BINLOG_VERSION master-bin.000001 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
master-bin.000001 # Gtid_list # # []
master-bin.000001 # Binlog_checkpoint # # master-bin.000001 master-bin.000001 # Binlog_checkpoint # # master-bin.000001
*** Test that binlog N is active, and commit checkpoint for (N-1) is *** Test that binlog N is active, and commit checkpoint for (N-1) is
*** done while there is still a pending commit checkpoint for (N-2). *** done while there is still a pending commit checkpoint for (N-2).
...@@ -51,8 +53,9 @@ master-bin.000003 # ...@@ -51,8 +53,9 @@ master-bin.000003 #
show binlog events in 'master-bin.000001' from <binlog_start>; show binlog events in 'master-bin.000001' from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc # # SERVER_VERSION, BINLOG_VERSION master-bin.000001 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
master-bin.000001 # Gtid_list # # []
master-bin.000001 # Binlog_checkpoint # # master-bin.000001 master-bin.000001 # Binlog_checkpoint # # master-bin.000001
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
...@@ -60,8 +63,9 @@ master-bin.000001 # Rotate # # master-bin.000002;pos=<binlog_start> ...@@ -60,8 +63,9 @@ master-bin.000001 # Rotate # # master-bin.000002;pos=<binlog_start>
show binlog events in 'master-bin.000002' from <binlog_start>; show binlog events in 'master-bin.000002' from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 # Format_desc # # SERVER_VERSION, BINLOG_VERSION master-bin.000002 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
master-bin.000002 # Gtid_list # # [#-#-#]
master-bin.000002 # Binlog_checkpoint # # master-bin.000001 master-bin.000002 # Binlog_checkpoint # # master-bin.000001
master-bin.000002 # Query # # BEGIN master-bin.000002 # Gtid # # BEGIN GTID #-#-#
master-bin.000002 # Table_map # # table_id: # (test.t1) master-bin.000002 # Table_map # # table_id: # (test.t1)
master-bin.000002 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000002 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000002 # Xid # # COMMIT /* XID */ master-bin.000002 # Xid # # COMMIT /* XID */
...@@ -69,6 +73,7 @@ master-bin.000002 # Rotate # # master-bin.000003;pos=<binlog_start> ...@@ -69,6 +73,7 @@ master-bin.000002 # Rotate # # master-bin.000003;pos=<binlog_start>
show binlog events in 'master-bin.000003' from <binlog_start>; show binlog events in 'master-bin.000003' from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION master-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
master-bin.000003 # Gtid_list # # [#-#-#]
master-bin.000003 # Binlog_checkpoint # # master-bin.000001 master-bin.000003 # Binlog_checkpoint # # master-bin.000001
SET DEBUG_SYNC= "RESET"; SET DEBUG_SYNC= "RESET";
SET @old_dbug= @@global.DEBUG_DBUG; SET @old_dbug= @@global.DEBUG_DBUG;
...@@ -81,12 +86,14 @@ SET DEBUG_SYNC= "RESET"; ...@@ -81,12 +86,14 @@ SET DEBUG_SYNC= "RESET";
show binlog events in 'master-bin.000003' from <binlog_start>; show binlog events in 'master-bin.000003' from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION master-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
master-bin.000003 # Gtid_list # # [#-#-#]
master-bin.000003 # Binlog_checkpoint # # master-bin.000001 master-bin.000003 # Binlog_checkpoint # # master-bin.000001
SET DEBUG_SYNC= "now SIGNAL con1_continue"; SET DEBUG_SYNC= "now SIGNAL con1_continue";
No commit checkpoints are pending, a new binlog checkpoint should have been logged. No commit checkpoints are pending, a new binlog checkpoint should have been logged.
show binlog events in 'master-bin.000003' from <binlog_start>; show binlog events in 'master-bin.000003' from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION master-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
master-bin.000003 # Gtid_list # # [#-#-#]
master-bin.000003 # Binlog_checkpoint # # master-bin.000001 master-bin.000003 # Binlog_checkpoint # # master-bin.000001
master-bin.000003 # Binlog_checkpoint # # master-bin.000003 master-bin.000003 # Binlog_checkpoint # # master-bin.000003
*** MDEV-4322: Broken XID counting during binlog rotation *** *** MDEV-4322: Broken XID counting during binlog rotation ***
......
mysql-test/suite/binlog/r/binlog_checksum.result
View file @ 665a31af
...@@ -12,6 +12,7 @@ flush logs; ...@@ -12,6 +12,7 @@ flush logs;
drop table t1; drop table t1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create table t1 (a int) master-bin.000001 # Query # # use `test`; create table t1 (a int)
master-bin.000001 # Rotate # # master-bin.000002;pos=4 master-bin.000001 # Rotate # # master-bin.000002;pos=4
show tables; show tables;
......
mysql-test/suite/binlog/r/binlog_database.result
View file @ 665a31af
...@@ -9,13 +9,19 @@ create procedure sp1 (a int) insert into t1 values(a); ...@@ -9,13 +9,19 @@ create procedure sp1 (a int) insert into t1 values(a);
drop database testing_1; drop database testing_1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # create database testing_1 master-bin.000001 # Query # # create database testing_1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; create table t1 (a int) master-bin.000001 # Query # # use `testing_1`; create table t1 (a int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` FUNCTION `sf1`(a int) RETURNS int(11) master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` FUNCTION `sf1`(a int) RETURNS int(11)
return a+1 return a+1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a) master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int) master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int)
insert into t1 values(a) insert into t1 values(a)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # drop database testing_1 master-bin.000001 # Query # # drop database testing_1
use test; use test;
reset master; reset master;
...@@ -27,16 +33,21 @@ insert into t1 values (1); ...@@ -27,16 +33,21 @@ insert into t1 values (1);
drop table tt1, t1; drop table tt1, t1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create temporary table tt1 (a int) master-bin.000001 # Query # # use `test`; create temporary table tt1 (a int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create table t1 (a int) master-bin.000001 # Query # # use `test`; create table t1 (a int)
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t1 values (1) master-bin.000001 # Query # # use `test`; insert into t1 values (1)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # drop database if exists mysqltest1 master-bin.000001 # Query # # drop database if exists mysqltest1
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t1 values (1) master-bin.000001 # Query # # use `test`; insert into t1 values (1)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
FLUSH STATUS; FLUSH STATUS;
# #
...@@ -58,6 +69,7 @@ Tables_in_db1 ...@@ -58,6 +69,7 @@ Tables_in_db1
t2 t2
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `db1`; DROP TABLE `t1` master-bin.000001 # Query # # use `db1`; DROP TABLE `t1`
DROP TABLE t3; DROP TABLE t3;
DROP DATABASE db1; DROP DATABASE db1;
...@@ -72,13 +84,19 @@ create procedure sp1 (a int) insert into t1 values(a); ...@@ -72,13 +84,19 @@ create procedure sp1 (a int) insert into t1 values(a);
drop database testing_1; drop database testing_1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # create database testing_1 master-bin.000001 # Query # # create database testing_1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; create table t1 (a int) master-bin.000001 # Query # # use `testing_1`; create table t1 (a int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` FUNCTION `sf1`(a int) RETURNS int(11) master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` FUNCTION `sf1`(a int) RETURNS int(11)
return a+1 return a+1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a) master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int) master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int)
insert into t1 values(a) insert into t1 values(a)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # drop database testing_1 master-bin.000001 # Query # # drop database testing_1
use test; use test;
reset master; reset master;
...@@ -90,16 +108,21 @@ insert into t1 values (1); ...@@ -90,16 +108,21 @@ insert into t1 values (1);
drop table tt1, t1; drop table tt1, t1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create temporary table tt1 (a int) master-bin.000001 # Query # # use `test`; create temporary table tt1 (a int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create table t1 (a int) master-bin.000001 # Query # # use `test`; create table t1 (a int)
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t1 values (1) master-bin.000001 # Query # # use `test`; insert into t1 values (1)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # drop database if exists mysqltest1 master-bin.000001 # Query # # drop database if exists mysqltest1
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; insert into t1 values (1) master-bin.000001 # Query # # use `test`; insert into t1 values (1)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
FLUSH STATUS; FLUSH STATUS;
# #
...@@ -121,6 +144,7 @@ Tables_in_db1 ...@@ -121,6 +144,7 @@ Tables_in_db1
t2 t2
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `db1`; DROP TABLE `t1` master-bin.000001 # Query # # use `db1`; DROP TABLE `t1`
DROP TABLE t3; DROP TABLE t3;
DROP DATABASE db1; DROP DATABASE db1;
...@@ -135,13 +159,19 @@ create procedure sp1 (a int) insert into t1 values(a); ...@@ -135,13 +159,19 @@ create procedure sp1 (a int) insert into t1 values(a);
drop database testing_1; drop database testing_1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # create database testing_1 master-bin.000001 # Query # # create database testing_1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; create table t1 (a int) master-bin.000001 # Query # # use `testing_1`; create table t1 (a int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` FUNCTION `sf1`(a int) RETURNS int(11) master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` FUNCTION `sf1`(a int) RETURNS int(11)
return a+1 return a+1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a) master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int) master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int)
insert into t1 values(a) insert into t1 values(a)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # drop database testing_1 master-bin.000001 # Query # # drop database testing_1
use test; use test;
reset master; reset master;
...@@ -153,17 +183,21 @@ insert into t1 values (1); ...@@ -153,17 +183,21 @@ insert into t1 values (1);
drop table tt1, t1; drop table tt1, t1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; create table t1 (a int) master-bin.000001 # Query # # use `test`; create table t1 (a int)
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # drop database if exists mysqltest1 master-bin.000001 # Query # # drop database if exists mysqltest1
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `tt1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `tt1` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
FLUSH STATUS; FLUSH STATUS;
# #
...@@ -185,6 +219,7 @@ Tables_in_db1 ...@@ -185,6 +219,7 @@ Tables_in_db1
t2 t2
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `db1`; DROP TABLE `t1` master-bin.000001 # Query # # use `db1`; DROP TABLE `t1`
DROP TABLE t3; DROP TABLE t3;
DROP DATABASE db1; DROP DATABASE db1;
......
mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
View file @ 665a31af
...@@ -13,6 +13,7 @@ master-bin.000001 # ...@@ -13,6 +13,7 @@ master-bin.000001 #
### assertion: binlog contents from regular entries ### assertion: binlog contents from regular entries
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a int) master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a int)
FLUSH LOGS; FLUSH LOGS;
### assertion: index file contains renamed binlog and the new one ### assertion: index file contains renamed binlog and the new one
...@@ -26,6 +27,7 @@ master-bin.000002 ...@@ -26,6 +27,7 @@ master-bin.000002
### renamed and changed the index file ### renamed and changed the index file
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin-b34582.000001 # Gtid # # GTID #-#-#
master-bin-b34582.000001 # Query # # use `test`; CREATE TABLE t1 (a int) master-bin-b34582.000001 # Query # # use `test`; CREATE TABLE t1 (a int)
### assertion: user changed binlog index shows correct entries ### assertion: user changed binlog index shows correct entries
show binary logs; show binary logs;
......
mysql-test/suite/binlog/r/binlog_drop_if_exists.result
View file @ 665a31af
...@@ -8,12 +8,19 @@ DROP TABLE IF EXISTS db_bug_13684.t; ...@@ -8,12 +8,19 @@ DROP TABLE IF EXISTS db_bug_13684.t;
DROP DATABASE IF EXISTS db_bug_13684; DROP DATABASE IF EXISTS db_bug_13684;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS db_bug_13684.tr master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS db_bug_13684.tr
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP VIEW IF EXISTS db_bug_13684.v master-bin.000001 # Query # # use `test`; DROP VIEW IF EXISTS db_bug_13684.v
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP EVENT IF EXISTS db_bug_13684.e master-bin.000001 # Query # # use `test`; DROP EVENT IF EXISTS db_bug_13684.e
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `db_bug_13684`.`t` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `db_bug_13684`.`t` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # DROP DATABASE IF EXISTS db_bug_13684 master-bin.000001 # Query # # DROP DATABASE IF EXISTS db_bug_13684
CREATE DATABASE db_bug_13684; CREATE DATABASE db_bug_13684;
CREATE TABLE db_bug_13684.t (a int); CREATE TABLE db_bug_13684.t (a int);
...@@ -34,26 +41,40 @@ RETURNS CHAR(50) DETERMINISTIC ...@@ -34,26 +41,40 @@ RETURNS CHAR(50) DETERMINISTIC
RETURN s; RETURN s;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS db_bug_13684.tr master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS db_bug_13684.tr
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP VIEW IF EXISTS db_bug_13684.v master-bin.000001 # Query # # use `test`; DROP VIEW IF EXISTS db_bug_13684.v
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP EVENT IF EXISTS db_bug_13684.e master-bin.000001 # Query # # use `test`; DROP EVENT IF EXISTS db_bug_13684.e
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `db_bug_13684`.`t` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `db_bug_13684`.`t` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # DROP DATABASE IF EXISTS db_bug_13684 master-bin.000001 # Query # # DROP DATABASE IF EXISTS db_bug_13684
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # CREATE DATABASE db_bug_13684 master-bin.000001 # Query # # CREATE DATABASE db_bug_13684
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE db_bug_13684.t (a int) master-bin.000001 # Query # # use `test`; CREATE TABLE db_bug_13684.t (a int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` EVENT db_bug_13684.e master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` EVENT db_bug_13684.e
ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR
DO DO
UPDATE db_bug_13684.t SET a = a + 1 UPDATE db_bug_13684.t SET a = a + 1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `db_bug_13684`.`v` AS SELECT * FROM db_bug_13684.t master-bin.000001 # Query # # use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `db_bug_13684`.`v` AS SELECT * FROM db_bug_13684.t
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` TRIGGER db_bug_13684.tr BEFORE INSERT ON db_bug_13684.t master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` TRIGGER db_bug_13684.tr BEFORE INSERT ON db_bug_13684.t
FOR EACH ROW BEGIN FOR EACH ROW BEGIN
END END
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `db_bug_13684`.`p`(OUT p1 INT) master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `db_bug_13684`.`p`(OUT p1 INT)
BEGIN BEGIN
END END
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION `db_bug_13684`.`f`(s CHAR(20)) RETURNS char(50) CHARSET latin1 master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION `db_bug_13684`.`f`(s CHAR(20)) RETURNS char(50) CHARSET latin1
DETERMINISTIC DETERMINISTIC
RETURN s RETURN s
...@@ -66,35 +87,56 @@ DROP TABLE IF EXISTS db_bug_13684.t; ...@@ -66,35 +87,56 @@ DROP TABLE IF EXISTS db_bug_13684.t;
DROP DATABASE IF EXISTS db_bug_13684; DROP DATABASE IF EXISTS db_bug_13684;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS db_bug_13684.tr master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS db_bug_13684.tr
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP VIEW IF EXISTS db_bug_13684.v master-bin.000001 # Query # # use `test`; DROP VIEW IF EXISTS db_bug_13684.v
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP EVENT IF EXISTS db_bug_13684.e master-bin.000001 # Query # # use `test`; DROP EVENT IF EXISTS db_bug_13684.e
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `db_bug_13684`.`t` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `db_bug_13684`.`t` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # DROP DATABASE IF EXISTS db_bug_13684 master-bin.000001 # Query # # DROP DATABASE IF EXISTS db_bug_13684
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # CREATE DATABASE db_bug_13684 master-bin.000001 # Query # # CREATE DATABASE db_bug_13684
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE db_bug_13684.t (a int) master-bin.000001 # Query # # use `test`; CREATE TABLE db_bug_13684.t (a int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` EVENT db_bug_13684.e master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` EVENT db_bug_13684.e
ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR
DO DO
UPDATE db_bug_13684.t SET a = a + 1 UPDATE db_bug_13684.t SET a = a + 1
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `db_bug_13684`.`v` AS SELECT * FROM db_bug_13684.t master-bin.000001 # Query # # use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `db_bug_13684`.`v` AS SELECT * FROM db_bug_13684.t
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` TRIGGER db_bug_13684.tr BEFORE INSERT ON db_bug_13684.t master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` TRIGGER db_bug_13684.tr BEFORE INSERT ON db_bug_13684.t
FOR EACH ROW BEGIN FOR EACH ROW BEGIN
END END
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `db_bug_13684`.`p`(OUT p1 INT) master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `db_bug_13684`.`p`(OUT p1 INT)
BEGIN BEGIN
END END
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION `db_bug_13684`.`f`(s CHAR(20)) RETURNS char(50) CHARSET latin1 master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION `db_bug_13684`.`f`(s CHAR(20)) RETURNS char(50) CHARSET latin1
DETERMINISTIC DETERMINISTIC
RETURN s RETURN s
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS db_bug_13684.tr master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS db_bug_13684.tr
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP VIEW IF EXISTS db_bug_13684.v master-bin.000001 # Query # # use `test`; DROP VIEW IF EXISTS db_bug_13684.v
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP EVENT IF EXISTS db_bug_13684.e master-bin.000001 # Query # # use `test`; DROP EVENT IF EXISTS db_bug_13684.e
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `db_bug_13684`.`t` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `db_bug_13684`.`t` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # DROP DATABASE IF EXISTS db_bug_13684 master-bin.000001 # Query # # DROP DATABASE IF EXISTS db_bug_13684
CREATE TABLE t1(id int); CREATE TABLE t1(id int);
DROP TABLE /* comment */ t1; DROP TABLE /* comment */ t1;
...@@ -106,11 +148,19 @@ CREATE TABLE t1(id int); ...@@ -106,11 +148,19 @@ CREATE TABLE t1(id int);
DROP TABLE IF EXISTS /* */ t1; DROP TABLE IF EXISTS /* */ t1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id int) master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE /* comment */ `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE /* comment */ `t1` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id int) master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS /* comment */ `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS /* comment */ `t1` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id int) master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE /**/ `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE /**/ `t1` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id int) master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS /* */ `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS /* */ `t1` /* generated by server */
mysql-test/suite/binlog/r/binlog_innodb.result
View file @ 665a31af
...@@ -65,50 +65,51 @@ UPDATE t1 SET b = 4*a WHERE a > 4; ...@@ -65,50 +65,51 @@ UPDATE t1 SET b = 4*a WHERE a > 4;
COMMIT; COMMIT;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6) master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6)
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 2*a WHERE a > 1 master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 2*a WHERE a > 1
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 3*a WHERE a > 3 master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 3*a WHERE a > 3
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 4*a WHERE a > 4 master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 4*a WHERE a > 4
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 3*a WHERE a > 3 master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 3*a WHERE a > 3
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 4*a WHERE a > 4 master-bin.000001 # Query # # use `test`; UPDATE t1 SET b = 4*a WHERE a > 4
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
......
mysql-test/suite/binlog/r/binlog_innodb_row.result
View file @ 665a31af
...@@ -9,7 +9,7 @@ commit; ...@@ -9,7 +9,7 @@ commit;
*** Results of the test: the binlog must have only Write_rows events not any Update_rows *** *** Results of the test: the binlog must have only Write_rows events not any Update_rows ***
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
...@@ -24,7 +24,7 @@ commit; ...@@ -24,7 +24,7 @@ commit;
*** Results of the test: the binlog must have only one Write_rows event not two *** *** Results of the test: the binlog must have only one Write_rows event not two ***
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
...@@ -40,11 +40,13 @@ DROP TABLE t1; ...@@ -40,11 +40,13 @@ DROP TABLE t1;
############################################### ###############################################
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 ( c1 int , primary key (c1)) ENGINE=InnoDB master-bin.000001 # Query # # use `test`; CREATE TABLE t1 ( c1 int , primary key (c1)) ENGINE=InnoDB
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
############################################### ###############################################
RESET MASTER; RESET MASTER;
...@@ -57,6 +59,7 @@ DROP TEMPORARY TABLE t1; ...@@ -57,6 +59,7 @@ DROP TEMPORARY TABLE t1;
############################################### ###############################################
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `t1` /* generated by server */
############################################### ###############################################
# #
......
mysql-test/suite/binlog/r/binlog_ioerr.result
View file @ 665a31af
...@@ -16,14 +16,16 @@ a ...@@ -16,14 +16,16 @@ a
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
BINLOG POS Format_desc 1 ENDPOS Server ver: #, Binlog ver: # BINLOG POS Format_desc 1 ENDPOS Server ver: #, Binlog ver: #
BINLOG POS Gtid_list 1 ENDPOS []
BINLOG POS Binlog_checkpoint 1 ENDPOS master-bin.000001 BINLOG POS Binlog_checkpoint 1 ENDPOS master-bin.000001
BINLOG POS Gtid 1 ENDPOS GTID 0-1-1
BINLOG POS Query 1 ENDPOS use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb BINLOG POS Query 1 ENDPOS use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb
BINLOG POS Query 1 ENDPOS BEGIN BINLOG POS Gtid 1 ENDPOS BEGIN GTID 0-1-2
BINLOG POS Query 1 ENDPOS use `test`; INSERT INTO t1 VALUES(0) BINLOG POS Query 1 ENDPOS use `test`; INSERT INTO t1 VALUES(0)
BINLOG POS Xid 1 ENDPOS COMMIT /* XID */ BINLOG POS Xid 1 ENDPOS COMMIT /* XID */
BINLOG POS Query 1 ENDPOS BEGIN BINLOG POS Gtid 1 ENDPOS BEGIN GTID 0-1-3
BINLOG POS Query 1 ENDPOS BEGIN BINLOG POS Gtid 1 ENDPOS BEGIN GTID 0-1-4
BINLOG POS Query 1 ENDPOS BEGIN BINLOG POS Gtid 1 ENDPOS BEGIN GTID 0-1-5
BINLOG POS Query 1 ENDPOS use `test`; INSERT INTO t1 VALUES(3) BINLOG POS Query 1 ENDPOS use `test`; INSERT INTO t1 VALUES(3)
BINLOG POS Xid 1 ENDPOS COMMIT /* XID */ BINLOG POS Xid 1 ENDPOS COMMIT /* XID */
DROP TABLE t1; DROP TABLE t1;
mysql-test/suite/binlog/r/binlog_killed.result
View file @ 665a31af
...@@ -93,7 +93,7 @@ select @b /* must be 1 at the end of a stmt calling bug27563() */; ...@@ -93,7 +93,7 @@ select @b /* must be 1 at the end of a stmt calling bug27563() */;
must have the update query event on the 4th line must have the update query event on the 4th line
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # User var # # @`b`=0 master-bin.000001 # User var # # @`b`=0
master-bin.000001 # Query # # use `test`; update t4 set b=b + bug27563(b) master-bin.000001 # Query # # use `test`; update t4 set b=b + bug27563(b)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
...@@ -132,7 +132,7 @@ select @b /* must be 1 at the end of a stmt calling bug27563() */; ...@@ -132,7 +132,7 @@ select @b /* must be 1 at the end of a stmt calling bug27563() */;
must have the delete query event on the 4th line must have the delete query event on the 4th line
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # User var # # @`b`=0 master-bin.000001 # User var # # @`b`=0
master-bin.000001 # Query # # use `test`; delete from t4 where b=bug27563(1) or b=bug27563(2) master-bin.000001 # Query # # use `test`; delete from t4 where b=bug27563(1) or b=bug27563(2)
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
......
mysql-test/suite/binlog/r/binlog_killed_simulate.result
View file @ 665a31af
...@@ -18,7 +18,7 @@ load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "kil ...@@ -18,7 +18,7 @@ load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "kil
ERROR 70100: Query execution was interrupted ERROR 70100: Query execution was interrupted
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=# master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
master-bin.000001 # Execute_load_query # # use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t2` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, `b`) ;file_id=# master-bin.000001 # Execute_load_query # # use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t2` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, `b`) ;file_id=#
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
......
mysql-test/suite/binlog/r/binlog_mdev342.result
View file @ 665a31af
...@@ -21,9 +21,11 @@ master-bin.000002 # ...@@ -21,9 +21,11 @@ master-bin.000002 #
show binlog events in 'master-bin.000001' from <binlog_start>; show binlog events in 'master-bin.000001' from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc # # SERVER_VERSION, BINLOG_VERSION master-bin.000001 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
master-bin.000001 # Gtid_list # # []
master-bin.000001 # Binlog_checkpoint # # master-bin.000001 master-bin.000001 # Binlog_checkpoint # # master-bin.000001
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
......
mysql-test/suite/binlog/r/binlog_mixed_load_data.result
View file @ 665a31af
...@@ -3,7 +3,7 @@ CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=MYISAM; ...@@ -3,7 +3,7 @@ CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=MYISAM;
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
......
mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
View file @ 665a31af
...@@ -2253,8 +2253,15 @@ DELIMITER /*!*/; ...@@ -2253,8 +2253,15 @@ DELIMITER /*!*/;
#010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup #010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
ROLLBACK/*!*/; ROLLBACK/*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Gtid list []
# at #
#010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1
/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
/*!100001 SET @@session.server_id=1*//*!*/;
/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
use `test`/*!*/; use `test`/*!*/;
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
...@@ -2357,9 +2364,8 @@ crn INT -- row number ...@@ -2357,9 +2364,8 @@ crn INT -- row number
) ENGINE=MyISAM DEFAULT CHARSET latin1 ) ENGINE=MyISAM DEFAULT CHARSET latin1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
SET @@session.time_zone='SYSTEM'/*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -2450,11 +2456,12 @@ BEGIN ...@@ -2450,11 +2456,12 @@ BEGIN
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
SET @@session.time_zone='SYSTEM'/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -2548,8 +2555,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -2548,8 +2555,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -2726,8 +2733,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -2726,8 +2733,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -2901,8 +2908,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -2901,8 +2908,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-6
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -3076,8 +3083,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -3076,8 +3083,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-7
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -3251,8 +3258,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -3251,8 +3258,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-8
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -3426,8 +3433,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -3426,8 +3433,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-9
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -3521,8 +3528,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -3521,8 +3528,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-10
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -3616,8 +3623,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -3616,8 +3623,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-11
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=11*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -3711,8 +3718,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -3711,8 +3718,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-12
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=12*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -3902,8 +3909,15 @@ DELIMITER /*!*/; ...@@ -3902,8 +3909,15 @@ DELIMITER /*!*/;
#010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup #010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
ROLLBACK/*!*/; ROLLBACK/*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Gtid list []
# at #
#010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1
/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
/*!100001 SET @@session.server_id=1*//*!*/;
/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
use `test`/*!*/; use `test`/*!*/;
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
...@@ -3922,8 +3936,8 @@ crn INT -- row number ...@@ -3922,8 +3936,8 @@ crn INT -- row number
) ENGINE=MyISAM DEFAULT CHARSET latin1 ) ENGINE=MyISAM DEFAULT CHARSET latin1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -3981,8 +3995,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -3981,8 +3995,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -4058,8 +4072,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -4058,8 +4072,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -4279,8 +4293,15 @@ DELIMITER /*!*/; ...@@ -4279,8 +4293,15 @@ DELIMITER /*!*/;
#010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup #010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
ROLLBACK/*!*/; ROLLBACK/*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Gtid list []
# at #
#010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1
/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
/*!100001 SET @@session.server_id=1*//*!*/;
/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
use `test`/*!*/; use `test`/*!*/;
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
...@@ -4299,6 +4320,9 @@ c_1_n INT -- row number ...@@ -4299,6 +4320,9 @@ c_1_n INT -- row number
) ENGINE=MyISAM DEFAULT CHARSET latin1 ) ENGINE=MyISAM DEFAULT CHARSET latin1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2
/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
CREATE TABLE t2 ( CREATE TABLE t2 (
...@@ -4308,6 +4332,9 @@ c_2_n INT -- row number ...@@ -4308,6 +4332,9 @@ c_2_n INT -- row number
) ENGINE=MyISAM DEFAULT CHARSET latin1 ) ENGINE=MyISAM DEFAULT CHARSET latin1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3
/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
CREATE TABLE t3 ( CREATE TABLE t3 (
...@@ -4317,8 +4344,8 @@ c_3_n INT -- row number ...@@ -4317,8 +4344,8 @@ c_3_n INT -- row number
) ENGINE=MyISAM DEFAULT CHARSET latin1 ) ENGINE=MyISAM DEFAULT CHARSET latin1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -4376,8 +4403,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -4376,8 +4403,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -4435,8 +4462,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -4435,8 +4462,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-6
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -4494,8 +4521,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -4494,8 +4521,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-7
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -4678,8 +4705,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -4678,8 +4705,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-8
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -4854,8 +4881,15 @@ DELIMITER /*!*/; ...@@ -4854,8 +4881,15 @@ DELIMITER /*!*/;
#010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup #010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
ROLLBACK/*!*/; ROLLBACK/*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Gtid list []
# at #
#010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1
/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
/*!100001 SET @@session.server_id=1*//*!*/;
/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
use `test`/*!*/; use `test`/*!*/;
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
...@@ -4874,8 +4908,8 @@ c3 VARCHAR(60) ...@@ -4874,8 +4908,8 @@ c3 VARCHAR(60)
) ENGINE=MyISAM DEFAULT CHARSET latin1 ) ENGINE=MyISAM DEFAULT CHARSET latin1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
......
mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
View file @ 665a31af
...@@ -132,8 +132,15 @@ DELIMITER /*!*/; ...@@ -132,8 +132,15 @@ DELIMITER /*!*/;
#010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup #010909 4:46:40 server id 1 end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
ROLLBACK/*!*/; ROLLBACK/*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Gtid list []
# at #
#010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1
/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
/*!100001 SET @@session.server_id=1*//*!*/;
/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
use `test`/*!*/; use `test`/*!*/;
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
...@@ -151,6 +158,9 @@ c2 VARCHAR(20) ...@@ -151,6 +158,9 @@ c2 VARCHAR(20)
) ENGINE=InnoDB DEFAULT CHARSET latin1 ) ENGINE=InnoDB DEFAULT CHARSET latin1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2
/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
CREATE TABLE t2 ( CREATE TABLE t2 (
...@@ -159,8 +169,8 @@ c2 VARCHAR(20) ...@@ -159,8 +169,8 @@ c2 VARCHAR(20)
) ENGINE=MyISAM DEFAULT CHARSET latin1 ) ENGINE=MyISAM DEFAULT CHARSET latin1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -216,18 +226,24 @@ BEGIN ...@@ -216,18 +226,24 @@ BEGIN
#010909 4:46:40 server id 1 end_log_pos # Xid = # #010909 4:46:40 server id 1 end_log_pos # Xid = #
COMMIT/*!*/; COMMIT/*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4
/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
TRUNCATE TABLE t1 TRUNCATE TABLE t1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5
/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
TRUNCATE TABLE t1 TRUNCATE TABLE t1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-6
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -252,8 +268,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -252,8 +268,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-7
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -287,8 +303,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -287,8 +303,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-8
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -305,8 +321,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -305,8 +321,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-9
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -362,18 +378,24 @@ BEGIN ...@@ -362,18 +378,24 @@ BEGIN
#010909 4:46:40 server id 1 end_log_pos # Xid = # #010909 4:46:40 server id 1 end_log_pos # Xid = #
COMMIT/*!*/; COMMIT/*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-10
/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
TRUNCATE TABLE t1 TRUNCATE TABLE t1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-11
/*!100001 SET @@session.gtid_seq_no=11*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
TRUNCATE TABLE t2 TRUNCATE TABLE t2
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-12
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=12*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -398,8 +420,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -398,8 +420,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-13
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=13*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -433,8 +455,8 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -433,8 +455,8 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # GTID 0-1-14
SET TIMESTAMP=1000000000/*!*/; /*!100001 SET @@session.gtid_seq_no=14*//*!*/;
BEGIN BEGIN
/*!*/; /*!*/;
# at # # at #
...@@ -451,11 +473,17 @@ SET TIMESTAMP=1000000000/*!*/; ...@@ -451,11 +473,17 @@ SET TIMESTAMP=1000000000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-15
/*!100001 SET @@session.gtid_seq_no=15*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
TRUNCATE TABLE t1 TRUNCATE TABLE t1
/*!*/; /*!*/;
# at # # at #
#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-16
/*!100001 SET @@session.gtid_seq_no=16*//*!*/;
# at #
#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/; SET TIMESTAMP=1000000000/*!*/;
TRUNCATE TABLE t2 TRUNCATE TABLE t2
......
mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
View file @ 665a31af
...@@ -5,7 +5,7 @@ reset master; ...@@ -5,7 +5,7 @@ reset master;
insert into t2 values (@v); insert into t2 values (@v);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t2) master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
...@@ -15,6 +15,8 @@ flush logs; ...@@ -15,6 +15,8 @@ flush logs;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/; DELIMITER /*!*/;
ROLLBACK/*!*/; ROLLBACK/*!*/;
BEGIN
/*!*/;
SET TIMESTAMP=10000/*!*/; SET TIMESTAMP=10000/*!*/;
SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
...@@ -24,9 +26,6 @@ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/ ...@@ -24,9 +26,6 @@ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
SET @@session.lc_time_names=0/*!*/; SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/; SET @@session.collation_database=DEFAULT/*!*/;
BEGIN
/*!*/;
SET TIMESTAMP=10000/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
DELIMITER ; DELIMITER ;
......
mysql-test/suite/binlog/r/binlog_row_drop_tbl.result
View file @ 665a31af
...@@ -8,9 +8,11 @@ DROP TABLE t1;; ...@@ -8,9 +8,11 @@ DROP TABLE t1;;
COMMIT; COMMIT;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT) master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
View file @ 665a31af
...@@ -25,16 +25,27 @@ GET_LOCK("a",10) ...@@ -25,16 +25,27 @@ GET_LOCK("a",10)
1 1
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # CREATE DATABASE `drop-temp+table-test` master-bin.000001 # Query # # CREATE DATABASE `drop-temp+table-test`
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; CREATE TABLE t(c1 int) master-bin.000001 # Query # # use `drop-temp+table-test`; CREATE TABLE t(c1 int)
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp` /* generated by server */ master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp` /* generated by server */ master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp1` /* generated by server */ master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp1` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp` /* generated by server */ master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp3` /* generated by server */ master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp3` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp2` /* generated by server */ master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp2` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TABLE IF EXISTS `t` /* generated by server */ master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TABLE IF EXISTS `t` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TABLE IF EXISTS `tmp2`,`t` /* generated by server */ master-bin.000001 # Query # # use `drop-temp+table-test`; DROP TABLE IF EXISTS `tmp2`,`t` /* generated by server */
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `shortn2`,`table:name`,`shortn1` master-bin.000001 # Query # # use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `shortn2`,`table:name`,`shortn1`
DROP DATABASE `drop-temp+table-test`; DROP DATABASE `drop-temp+table-test`;
RESET MASTER; RESET MASTER;
...@@ -47,11 +58,13 @@ SELECT @@session.binlog_format; ...@@ -47,11 +58,13 @@ SELECT @@session.binlog_format;
ROW ROW
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 ( i text ) master-bin.000001 # Query # # use `test`; CREATE TABLE t1 ( i text )
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ttmp1` master-bin.000001 # Query # # use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ttmp1`
RESET MASTER; RESET MASTER;
DROP TABLE t1; DROP TABLE t1;
mysql-test/suite/binlog/r/binlog_row_insert_select.result
View file @ 665a31af
...@@ -8,7 +8,7 @@ insert into t1 select * from t2; ...@@ -8,7 +8,7 @@ insert into t1 select * from t2;
ERROR 23000: Duplicate entry '2' for key 'a' ERROR 23000: Duplicate entry '2' for key 'a'
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Table_map # # table_id: # (test.t1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
......
mysql-test/suite/binlog/r/binlog_stm_do_db.result
View file @ 665a31af
...@@ -34,8 +34,11 @@ COMMIT; ...@@ -34,8 +34,11 @@ COMMIT;
### assertion: filtered events did not make into the binlog ### assertion: filtered events did not make into the binlog
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # CREATE DATABASE b42829 master-bin.000001 # Query # # CREATE DATABASE b42829
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `b42829`; CREATE TABLE t1 (x int, y int) engine=InnoDB master-bin.000001 # Query # # use `b42829`; CREATE TABLE t1 (x int, y int) engine=InnoDB
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `b42829`; CREATE TABLE t2 (x int, y int) engine=InnoDB master-bin.000001 # Query # # use `b42829`; CREATE TABLE t2 (x int, y int) engine=InnoDB
DROP DATABASE b42829; DROP DATABASE b42829;
DROP DATABASE b42829_filtered; DROP DATABASE b42829_filtered;
......
mysql-test/suite/maria/maria-connect.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/multi_source/gtid.cnf 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/multi_source/gtid.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/multi_source/gtid.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/multi_source/simple.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/multi_source/syntax.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/perfschema/t/relaylog.test
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_checksum.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_do_grant.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_drop_temp.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_gtid_basic.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_gtid_crash.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_gtid_startpos.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_gtid_stop_start.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_hrtime.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_mdev382.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_rewrt_db.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_row_drop.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_row_log.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_sp.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_stm_log.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_sync.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_user.result
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_corruption.test
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_basic.cnf 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_basic.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_crash-master.opt 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_crash.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_nobinlog.cnf 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_startpos.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_stop_start.cnf 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_gtid_stop_start.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_rotate_logs.test
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_row_until.test
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_server_id2.test
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_sync.test
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/sys_vars/r/gtid_domain_id_basic.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/sys_vars/r/gtid_pos_basic.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/sys_vars/r/gtid_seq_no_basic.result 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/sys_vars/t/gtid_domain_id_basic.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/sys_vars/t/gtid_pos_basic.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/suite/sys_vars/t/gtid_seq_no_basic.test 0 → 100644
View file @ 665a31af
This diff is collapsed.
mysql-test/t/mysqlbinlog.test
View file @ 665a31af
This diff is collapsed.
mysql-test/t/system_mysql_db_fix40123.test
View file @ 665a31af
This diff is collapsed.
mysql-test/t/system_mysql_db_fix50030.test
View file @ 665a31af
This diff is collapsed.
mysql-test/t/system_mysql_db_fix50117.test
View file @ 665a31af
This diff is collapsed.
mysql-test/t/xa_binlog.test
View file @ 665a31af
This diff is collapsed.
scripts/mysql_install_db.sh
View file @ 665a31af
This diff is collapsed.
scripts/mysql_system_tables.sql
View file @ 665a31af
This diff is collapsed.
sql/CMakeLists.txt
View file @ 665a31af
This diff is collapsed.
sql/event_parse_data.cc
View file @ 665a31af
This diff is collapsed.
sql/item_create.cc
View file @ 665a31af
This diff is collapsed.
sql/item_func.cc
View file @ 665a31af
This diff is collapsed.
sql/item_strfunc.cc
View file @ 665a31af
This diff is collapsed.
sql/item_strfunc.h
View file @ 665a31af
This diff is collapsed.
sql/lex.h
View file @ 665a31af
This diff is collapsed.
sql/log.cc
View file @ 665a31af
This diff is collapsed.
sql/log.h
View file @ 665a31af
This diff is collapsed.
sql/log_event.cc
View file @ 665a31af
This diff is collapsed.
sql/log_event.h
View file @ 665a31af
This diff is collapsed.
sql/log_event_old.cc
View file @ 665a31af
This diff is collapsed.
sql/mysqld.cc
View file @ 665a31af
This diff is collapsed.
sql/mysqld.h
View file @ 665a31af
This diff is collapsed.
sql/repl_failsafe.cc
View file @ 665a31af
This diff is collapsed.
sql/rpl_gtid.cc 0 → 100644
View file @ 665a31af
This diff is collapsed.
sql/rpl_gtid.h 0 → 100644
View file @ 665a31af
This diff is collapsed.
sql/rpl_handler.cc
View file @ 665a31af
This diff is collapsed.
sql/rpl_injector.cc
View file @ 665a31af
This diff is collapsed.
sql/rpl_mi.cc
View file @ 665a31af
This diff is collapsed.
sql/rpl_mi.h
View file @ 665a31af
This diff is collapsed.
sql/rpl_rli.cc
View file @ 665a31af
This diff is collapsed.
sql/rpl_rli.h
View file @ 665a31af
This diff is collapsed.
sql/share/errmsg-utf8.txt
View file @ 665a31af
This diff is collapsed.
sql/slave.cc
View file @ 665a31af
This diff is collapsed.
sql/sql_base.cc
View file @ 665a31af
This diff is collapsed.
sql/sql_class.cc
View file @ 665a31af
This diff is collapsed.
sql/sql_class.h
View file @ 665a31af
This diff is collapsed.
sql/sql_lex.h
View file @ 665a31af
This diff is collapsed.
sql/sql_parse.cc
View file @ 665a31af
This diff is collapsed.
sql/sql_repl.cc
View file @ 665a31af
This diff is collapsed.
sql/sql_repl.h
View file @ 665a31af
This diff is collapsed.
sql/sql_yacc.yy
View file @ 665a31af
This diff is collapsed.
sql/sys_vars.cc
View file @ 665a31af
This diff is collapsed.
sql/sys_vars.h
View file @ 665a31af
This diff is collapsed.
sql/table.cc
View file @ 665a31af
This diff is collapsed.
sql/table.h
View file @ 665a31af
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7