diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
| commit | 1c6ad62a269a3a03d8a343e1412876e04e9e9c37 (patch) | |
| tree | 1e837eb728452ebaf749b5f9eedc018404798ed6 /mysql-test/r/variables.result | |
| parent | 14200dfa43756a0f9cb50c0b5d47d99b4fb1b6fa (diff) | |
| parent | e9b2f5bf15281583b38a56b12f9ae2420c46a6d1 (diff) | |
| download | mariadb-git-1c6ad62a269a3a03d8a343e1412876e04e9e9c37.tar.gz | |
mysql-5.5.39 merge
~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index dd74e02a26f..28b67732a77 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -189,6 +189,8 @@ select @@concurrent_insert; @@concurrent_insert AUTO set global timed_mutexes=ON; +Warnings: +Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release. show variables like 'timed_mutexes'; Variable_name Value timed_mutexes ON @@ -196,6 +198,8 @@ select * from information_schema.session_variables where variable_name like 'tim VARIABLE_NAME VARIABLE_VALUE TIMED_MUTEXES ON set global timed_mutexes=0; +Warnings: +Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release. show variables like 'timed_mutexes'; Variable_name Value timed_mutexes OFF |