diff options
| author | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2010-01-18 23:00:48 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2010-01-18 23:00:48 +0100 |
| commit | b030db38afd987bad2bb51e109197c16c0460266 (patch) | |
| tree | 3c1cefd03a6d459d29396a65e71d249ea12fa5b9 /mysql-test/r/mysqld--help-notwin.result | |
| parent | cf4732275ed0a19ad7c60641cb5fd0d87cd0e094 (diff) | |
| parent | dccf2acceab7a3ed125c0d9c11330fe5f6898a1f (diff) | |
| download | mariadb-git-b030db38afd987bad2bb51e109197c16c0460266.tar.gz | |
merge
Diffstat (limited to 'mysql-test/r/mysqld--help-notwin.result')
| -rw-r--r-- | mysql-test/r/mysqld--help-notwin.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result index e79dce0e534..4de3faf9a47 100644 --- a/mysql-test/r/mysqld--help-notwin.result +++ b/mysql-test/r/mysqld--help-notwin.result @@ -645,6 +645,12 @@ The following options may be given as the first argument: Number of times the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait timeout, before giving up and stopping + --slave-type-conversions=name + Set of slave type conversions that are enabled. Legal + values are: ALL_LOSSY to enable lossy conversions and + ALL_NON_LOSSY to enable non-lossy conversions. If the + variable is assigned the empty set, no conversions are + allowed and it is expected that the types match exactly. --slow-launch-time=# If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be @@ -933,6 +939,7 @@ slave-exec-mode STRICT slave-net-timeout 3600 slave-skip-errors (No default value) slave-transaction-retries 10 +slave-type-conversions slow-launch-time 2 slow-query-log FALSE socket /tmp/mysql.sock |