diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-03-26 10:35:34 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-03-26 10:35:34 +0100 |
| commit | d9f975d08bc4480109b172e1f9c3799a375c238d (patch) | |
| tree | d3a2b8fca828d150b3b25b6b688b979f6336f355 /mysql-test/r/mysqlbinlog-innodb.result | |
| parent | a3f651d0f635df1a29d152c7088150b3ba144b72 (diff) | |
| download | mariadb-git-d9f975d08bc4480109b172e1f9c3799a375c238d.tar.gz | |
MDEV-26: Global transaction ID
Adjust full test suite to work with GTID.
Huge patch, mainly due to having to update .result file for all SHOW BINLOG
EVENTS and mysqlbinlog outputs, where the new GTID events pop up.
Everything was painstakingly checked to be still correct and valid .result
file updates.
Diffstat (limited to 'mysql-test/r/mysqlbinlog-innodb.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog-innodb.result | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mysql-test/r/mysqlbinlog-innodb.result b/mysql-test/r/mysqlbinlog-innodb.result index 41d15bc32d3..545e52a0c54 100644 --- a/mysql-test/r/mysqlbinlog-innodb.result +++ b/mysql-test/r/mysqlbinlog-innodb.result @@ -23,6 +23,9 @@ FLUSH LOGS; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; DELIMITER /*!*/; ROLLBACK/*!*/; +BEGIN +/*!*/; +use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; 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/*!*/; @@ -32,14 +35,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.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; -BEGIN -/*!*/; -use `test`/*!*/; -SET TIMESTAMP=1000000000/*!*/; INSERT INTO t1 VALUES (1) /*!*/; COMMIT/*!*/; -SET TIMESTAMP=1000000000/*!*/; BEGIN /*!*/; SET TIMESTAMP=1000000000/*!*/; @@ -54,6 +52,9 @@ ROLLBACK /* added by mysqlbinlog */; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; DELIMITER /*!*/; ROLLBACK/*!*/; +BEGIN +/*!*/; +use `foo`/*!*/; SET TIMESTAMP=1000000000/*!*/; 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/*!*/; @@ -63,14 +64,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.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; -BEGIN -/*!*/; -use `foo`/*!*/; -SET TIMESTAMP=1000000000/*!*/; INSERT INTO t1 VALUES (1) /*!*/; COMMIT/*!*/; -SET TIMESTAMP=1000000000/*!*/; BEGIN /*!*/; SET TIMESTAMP=1000000000/*!*/; |