summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/1st.result2
-rw-r--r--mysql-test/r/connect.result6
-rw-r--r--mysql-test/r/information_schema.result2
-rw-r--r--mysql-test/r/log_tables_upgrade.result2
-rw-r--r--mysql-test/r/myisam.result4
-rw-r--r--mysql-test/r/mysql_upgrade.result14
-rw-r--r--mysql-test/r/mysql_upgrade_ssl.result2
-rw-r--r--mysql-test/r/mysqlcheck.result8
-rw-r--r--mysql-test/r/mysqld--help.result7
-rw-r--r--mysql-test/r/mysqldump-max.result8
-rw-r--r--mysql-test/r/repair.result4
-rw-r--r--mysql-test/r/stat_tables_rbr.result24
-rw-r--r--mysql-test/r/system_mysql_db.result2
-rw-r--r--mysql-test/r/system_mysql_db_fix40123.result2
-rw-r--r--mysql-test/r/system_mysql_db_fix50030.result2
-rw-r--r--mysql-test/r/system_mysql_db_fix50117.result2
16 files changed, 48 insertions, 43 deletions
diff --git a/mysql-test/r/1st.result b/mysql-test/r/1st.result
index 36500302579..7e4ab09b09d 100644
--- a/mysql-test/r/1st.result
+++ b/mysql-test/r/1st.result
@@ -13,6 +13,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -26,7 +27,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result
index 94c68324149..3fcc5b5d2c1 100644
--- a/mysql-test/r/connect.result
+++ b/mysql-test/r/connect.result
@@ -7,6 +7,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -20,7 +21,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
@@ -50,6 +50,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -63,7 +64,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
@@ -101,6 +101,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -114,7 +115,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 8e1d4856645..ce962a96f29 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -88,6 +88,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -98,7 +99,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slow_log
t1
diff --git a/mysql-test/r/log_tables_upgrade.result b/mysql-test/r/log_tables_upgrade.result
index 5afe4cf6ec2..5732b94a90c 100644
--- a/mysql-test/r/log_tables_upgrade.result
+++ b/mysql-test/r/log_tables_upgrade.result
@@ -24,6 +24,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -38,7 +39,6 @@ mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
mysql.renamed_general_log OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 2530182ea67..267110be487 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -2355,7 +2355,7 @@ Warnings:
Warning 1292 Truncated incorrect myisam_sort_buffer_size value: '4'
REPAIR TABLE t1;
Table Op Msg_type Msg_text
-test.t1 repair error myisam_sort_buffer_size is too small
+test.t1 repair error myisam_sort_buffer_size is too small. X
test.t1 repair warning Number of rows changed from 0 to 7168
test.t1 repair status OK
SET myisam_repair_threads=2;
@@ -2424,7 +2424,7 @@ INSERT INTO t1 VALUES
('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
('0'),('0'),('0'),('0'),('0'),('0'),('0');
Warnings:
-Error 1034 myisam_sort_buffer_size is too small
+Error 1034 myisam_sort_buffer_size is too small. X
Error 1034 Number of rows changed from 0 to 157
SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
INSERT INTO t1 VALUES('1');
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
index 25065ffae30..3921d6c9627 100644
--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/r/mysql_upgrade.result
@@ -12,6 +12,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -25,7 +26,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
@@ -58,6 +58,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -71,7 +72,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
@@ -104,6 +104,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -117,7 +118,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
@@ -153,6 +153,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -166,7 +167,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
@@ -205,6 +205,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -218,7 +219,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
@@ -260,6 +260,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -273,7 +274,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
@@ -318,6 +318,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -331,7 +332,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/mysql-test/r/mysql_upgrade_ssl.result
index 166dd428da1..60bf427cef6 100644
--- a/mysql-test/r/mysql_upgrade_ssl.result
+++ b/mysql-test/r/mysql_upgrade_ssl.result
@@ -14,6 +14,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -27,7 +28,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index 4d2657bdfb6..17dc9ad9a35 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -8,6 +8,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -21,7 +22,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
@@ -41,6 +41,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -58,7 +59,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
@@ -76,6 +76,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -89,7 +90,6 @@ mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK
@@ -107,6 +107,7 @@ mysql.columns_priv Table is already up to date
mysql.db Table is already up to date
mysql.event Table is already up to date
mysql.func Table is already up to date
+mysql.gtid_slave_pos Table is already up to date
mysql.help_category Table is already up to date
mysql.help_keyword Table is already up to date
mysql.help_relation Table is already up to date
@@ -124,7 +125,6 @@ mysql.plugin Table is already up to date
mysql.proc 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.rpl_slave_state Table is already up to date
mysql.servers Table is already up to date
mysql.slave_master_info Table is already up to date
mysql.slave_relay_log_info Table is already up to date
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index d7074d140b3..51dfc3123a4 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -205,6 +205,10 @@ The following options may be given as the first argument:
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.
+ --gtid-strict-mode Enforce strict seq_no ordering of events in the binary
+ log. Slave stops with an error if it encounters an event
+ that would cause it to generate an out-of-order binlog if
+ executed.
-?, --help Display this help and exit.
--histogram-size=# Number of bytes used for a histogram. If set to 0, no
histograms are created by ANALYZE.
@@ -1039,6 +1043,7 @@ gdb FALSE
general-log FALSE
group-concat-max-len 1024
gtid-domain-id 0
+gtid-strict-mode FALSE
help TRUE
histogram-size 0
histogram-type SINGLE_PREC_HB
@@ -1118,7 +1123,7 @@ myisam-max-sort-file-size 9223372036853727232
myisam-mmap-size 18446744073709551615
myisam-recover-options DEFAULT
myisam-repair-threads 1
-myisam-sort-buffer-size 8388608
+myisam-sort-buffer-size 134216704
myisam-stats-method nulls_unequal
myisam-use-mmap FALSE
net-buffer-length 16384
diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/r/mysqldump-max.result
index 2164b513335..8d5ab551bee 100644
--- a/mysql-test/r/mysqldump-max.result
+++ b/mysql-test/r/mysqldump-max.result
@@ -334,10 +334,10 @@ DROP TABLE t1;
DROP TABLE t2;
SHOW BINLOG EVENTS LIMIT 7,3;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 591 Xid 1 618 COMMIT /* XID */
-master-bin.000001 618 Gtid 1 656 GTID 0-1-3
-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=937;
+master-bin.000001 593 Xid 1 620 COMMIT /* XID */
+master-bin.000001 620 Gtid 1 658 GTID 0-1-3
+master-bin.000001 658 Query 1 777 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=939;
SELECT * FROM t1 ORDER BY a;
a
1
diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result
index 1a98f2f0f36..241c32b4b40 100644
--- a/mysql-test/r/repair.result
+++ b/mysql-test/r/repair.result
@@ -77,12 +77,12 @@ INSERT INTO t1 VALUES
('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
('0'),('0'),('0'),('0'),('0'),('0'),('0');
Warnings:
-Error 1034 myisam_sort_buffer_size is too small
+Error 1034 myisam_sort_buffer_size is too small. X
Error 1034 Number of rows changed from 0 to 157
SET myisam_repair_threads=2;
REPAIR TABLE t1;
Table Op Msg_type Msg_text
-test.t1 repair error myisam_sort_buffer_size is too small
+test.t1 repair error myisam_sort_buffer_size is too small. X
test.t1 repair warning Number of rows changed from 0 to 157
test.t1 repair status OK
SET myisam_repair_threads=@@global.myisam_repair_threads;
diff --git a/mysql-test/r/stat_tables_rbr.result b/mysql-test/r/stat_tables_rbr.result
index 27c326265f1..0c941bcb248 100644
--- a/mysql-test/r/stat_tables_rbr.result
+++ b/mysql-test/r/stat_tables_rbr.result
@@ -16,17 +16,17 @@ test.t1 analyze status OK
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 248 Server ver: #, Binlog ver: #
-master-bin.000001 248 Gtid_list 1 271 []
-master-bin.000001 271 Binlog_checkpoint 1 311 master-bin.000001
-master-bin.000001 311 Gtid 1 349 GTID 0-1-1
-master-bin.000001 349 Query 1 449 use `test`; CREATE TABLE t1 (i INT) ENGINE=InnoDB
-master-bin.000001 449 Gtid 1 487 GTID 0-1-2
-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
+master-bin.000001 248 Gtid_list 1 273 []
+master-bin.000001 273 Binlog_checkpoint 1 313 master-bin.000001
+master-bin.000001 313 Gtid 1 351 GTID 0-1-1
+master-bin.000001 351 Query 1 451 use `test`; CREATE TABLE t1 (i INT) ENGINE=InnoDB
+master-bin.000001 451 Gtid 1 489 GTID 0-1-2
+master-bin.000001 489 Query 1 568 use `test`; ANALYZE TABLE t1
+master-bin.000001 568 Gtid 1 606 GTID 0-1-3
+master-bin.000001 606 Query 1 710 use `test`; DROP TABLE `t1` /* generated by server */
+master-bin.000001 710 Gtid 1 748 GTID 0-1-4
+master-bin.000001 748 Query 1 884 use `test`; CREATE TABLE t1 ( a INT ) ENGINE=MyISAM PARTITION BY HASH(a) PARTITIONS 2
+master-bin.000001 884 Gtid 1 922 GTID 0-1-5
+master-bin.000001 922 Query 1 1020 use `test`; ALTER TABLE t1 ANALYZE PARTITION p1
SET use_stat_tables = DEFAULT;
DROP TABLE t1;
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result
index f481f981aba..08c17b1afd5 100644
--- a/mysql-test/r/system_mysql_db.result
+++ b/mysql-test/r/system_mysql_db.result
@@ -6,6 +6,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -19,7 +20,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
diff --git a/mysql-test/r/system_mysql_db_fix40123.result b/mysql-test/r/system_mysql_db_fix40123.result
index 7ccc3d40746..2f76ee654c8 100644
--- a/mysql-test/r/system_mysql_db_fix40123.result
+++ b/mysql-test/r/system_mysql_db_fix40123.result
@@ -6,6 +6,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -19,7 +20,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
diff --git a/mysql-test/r/system_mysql_db_fix50030.result b/mysql-test/r/system_mysql_db_fix50030.result
index 7ccc3d40746..2f76ee654c8 100644
--- a/mysql-test/r/system_mysql_db_fix50030.result
+++ b/mysql-test/r/system_mysql_db_fix50030.result
@@ -6,6 +6,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -19,7 +20,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
diff --git a/mysql-test/r/system_mysql_db_fix50117.result b/mysql-test/r/system_mysql_db_fix50117.result
index 7ccc3d40746..2f76ee654c8 100644
--- a/mysql-test/r/system_mysql_db_fix50117.result
+++ b/mysql-test/r/system_mysql_db_fix50117.result
@@ -6,6 +6,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -19,7 +20,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
View Lorry Controller Status