diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-04-20 16:14:37 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-04-21 10:30:17 +0200 |
| commit | 638d4e90e823756922f162af7783ad122d03f6dc (patch) | |
| tree | 50ffaba7c53b25f7683d960e35cc37bbc1ad59c5 | |
| parent | 094e4b264cf54b0cdb0f0fc2d7b978e93e83bfce (diff) | |
| download | mariadb-git-638d4e90e823756922f162af7783ad122d03f6dc.tar.gz | |
MDEV-12179: Per-engine mysql.gtid_slave_pos table
Intermediate commit.
.result file updates due to added --gtid-pos-auto-engines sysvar.
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result | 14 |
2 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index cfd2ede6ef9..c5f8be932e0 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -257,6 +257,13 @@ The following options may be given as the first argument: applied; this means it is the responsibility of the user to ensure that GTID sequence numbers are strictly increasing. + --gtid-pos-auto-engines=name + List of engines for which to automatically create a + mysql.gtid_slave_pos_ENGINE table, if a transaction using + that engine is replicated. This can be used to avoid + introducing cross-engine transactions, if engines are + used different from that used by table + mysql.gtid_slave_pos --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 @@ -1254,6 +1261,7 @@ getopt-prefix-matching TRUE group-concat-max-len 1048576 gtid-domain-id 0 gtid-ignore-duplicates FALSE +gtid-pos-auto-engines gtid-strict-mode FALSE help TRUE histogram-size 0 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 052d30563b2..a6709bcb863 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -1115,6 +1115,20 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME GTID_POS_AUTO_ENGINES +SESSION_VALUE NULL +GLOBAL_VALUE +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE VARCHAR +VARIABLE_COMMENT List of engines for which to automatically create a mysql.gtid_slave_pos_ENGINE table, if a transaction using that engine is replicated. This can be used to avoid introducing cross-engine transactions, if engines are used different from that used by table mysql.gtid_slave_pos +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME GTID_SEQ_NO SESSION_VALUE 0 GLOBAL_VALUE NULL |