diff options
| author | Kentoku <kentokushiba@gmail.com> | 2019-04-12 18:30:58 +0900 |
|---|---|---|
| committer | Kentoku <kentokushiba@gmail.com> | 2019-04-12 20:14:31 +0900 |
| commit | 4e7cc01f9a26b3ce9b3a6691816403d115c2a24b (patch) | |
| tree | e8f6efc252b6b7c5c259bebaf02e5fd6e7f70d80 | |
| parent | 3cb3bc0bf9fe320ef9575d144b4312b06be5e3a9 (diff) | |
| download | mariadb-git-bb-10.4-MDEV-16543.tar.gz | |
MDEV-16543 Replicating to spider is fragile without retriesbb-10.4-MDEV-16543
add changes of test results
| -rw-r--r-- | mysql-test/main/mysqld--help.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 4ea105e5e12..ed4b9cb03f7 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1207,8 +1207,10 @@ The following specify which files/extra groups are read (specified before remain --slave-transaction-retry-errors=name Tells the slave thread to retry transaction for replication when a query event returns an error from the - provided list. Deadlock and elapsed lock wait timeout - errors are automatically added to this list + provided list. Deadlock error, elapsed lock wait timeout, + net read error, net read timeout, net write error, net + write timeout, connect error and 2 types of lost + connection error are automatically added to this list --slave-transaction-retry-interval=# Interval of the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait @@ -1712,7 +1714,7 @@ slave-run-triggers-for-rbr NO slave-skip-errors OFF slave-sql-verify-checksum TRUE slave-transaction-retries 10 -slave-transaction-retry-errors 1213,1205 +slave-transaction-retry-errors 1158,1159,1160,1161,1205,1213,1429,2013,12701 slave-transaction-retry-interval 0 slave-type-conversions slow-launch-time 2 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 bbe01baa380..6a1dacfe67b 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -4676,12 +4676,12 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_TRANSACTION_RETRY_ERRORS SESSION_VALUE NULL -GLOBAL_VALUE 1213,1205 +GLOBAL_VALUE 1158,1159,1160,1161,1205,1213,1429,2013,12701 GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Tells the slave thread to retry transaction for replication when a query event returns an error from the provided list. Deadlock and elapsed lock wait timeout errors are automatically added to this list +VARIABLE_COMMENT Tells the slave thread to retry transaction for replication when a query event returns an error from the provided list. Deadlock error, elapsed lock wait timeout, net read error, net read timeout, net write error, net write timeout, connect error and 2 types of lost connection error are automatically added to this list NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL |