diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-07-28 15:49:59 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-07-28 15:49:59 -0400 |
| commit | 67480fc5fd7fafc5838a6b8230100a3fc4810481 (patch) | |
| tree | 0be984d2623f11a13e7b923fc9894b4896ae9cd4 /mysql-test/suite/sys_vars | |
| parent | b522c71e4be54708dc935f0ad5347fd4b06199ef (diff) | |
| download | mariadb-git-67480fc5fd7fafc5838a6b8230100a3fc4810481.tar.gz | |
MDEV-10429: sys_vars.sysvars_wsrep fails in buildbot on host 'work' (valgrind builder)
- Fixed the test
- Improved comment for wsrep_drupal_282555_workaround
Diffstat (limited to 'mysql-test/suite/sys_vars')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_wsrep.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/t/sysvars_wsrep.test | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index f1745a1ad34..3d7ec08166d 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -162,7 +162,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE OFF VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT To use a workaround forbad autoincrement value +VARIABLE_COMMENT Enable a workaround to handle the cases where inserting a DEFAULT value into an auto-increment column could fail with duplicate key error NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/t/sysvars_wsrep.test b/mysql-test/suite/sys_vars/t/sysvars_wsrep.test index 25454191e2e..700b129fd62 100644 --- a/mysql-test/suite/sys_vars/t/sysvars_wsrep.test +++ b/mysql-test/suite/sys_vars/t/sysvars_wsrep.test @@ -3,7 +3,9 @@ --let $datadir = `SELECT @@datadir` --let $hostname = `SELECT @@hostname` ---replace_result $datadir DATADIR $hostname HOSTNAME +--replace_result $datadir DATADIR +--let $hostname_regex=/^$hostname\$/HOSTNAME/ +--replace_regex $hostname_regex --vertical_results select * from information_schema.system_variables where variable_name like 'wsrep%' |