diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-08-23 16:49:42 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-08-23 16:49:42 +0530 |
| commit | 5077cc0b1a0d82c55ce6b6ec643f04099d0e8416 (patch) | |
| tree | eeca5d1938aa46bf6cbe6ebd375aee2f246e508d /mysql-test/suite/sys_vars | |
| parent | 0aeff8c36add46db1de4287a9461d084b148c31f (diff) | |
| download | mariadb-git-5077cc0b1a0d82c55ce6b6ec643f04099d0e8416.tar.gz | |
Fix Merge Error
Diffstat (limited to 'mysql-test/suite/sys_vars')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_wsrep.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index 69df8c0f19e..0c206975c29 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -598,7 +598,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Ensure "synchronous" read view before executing an operation of the type specified by bitmask: 1 - READ(includes SELECT, SHOW and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - INSERT and REPLACE NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 7 +NUMERIC_MAX_VALUE 15 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO |