summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/r/flush_time_basic.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-12-12 23:58:40 +0100
committerSergei Golubchik <sergii@pisem.net>2011-12-12 23:58:40 +0100
commit2ccf247e939b39d1f84908a56b8717150e5fd1b4 (patch)
treec0a9a318a055f87e13206656d7765f96d3293d9f /mysql-test/suite/sys_vars/r/flush_time_basic.result
parent6cc9d0ffa0b6d9d0f19cf9445fad0e0ba11e38f8 (diff)
downloadmariadb-git-2ccf247e939b39d1f84908a56b8717150e5fd1b4.tar.gz
after merge changes:
* rename all debugging related command-line options and variables to start from "debug-", and made them all OFF by default. * replace "MySQL" with "MariaDB" in error messages * "Cast ... converted ... integer to it's ... complement" is now a note, not a warning * @@query_cache_strip_comments now has a session scope, not global.
Diffstat (limited to 'mysql-test/suite/sys_vars/r/flush_time_basic.result')
-rw-r--r--mysql-test/suite/sys_vars/r/flush_time_basic.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/flush_time_basic.result b/mysql-test/suite/sys_vars/r/flush_time_basic.result
index 45d0f74aa65..ab34db72c3b 100644
--- a/mysql-test/suite/sys_vars/r/flush_time_basic.result
+++ b/mysql-test/suite/sys_vars/r/flush_time_basic.result
@@ -34,7 +34,7 @@ select @@global.flush_time;
0
set global flush_time=cast(-1 as unsigned int);
Warnings:
-Warning 1105 Cast to unsigned converted negative integer to it's positive complement
+Note 1105 Cast to unsigned converted negative integer to it's positive complement
Warning 1292 Truncated incorrect flush_time value: '18446744073709551615'
select @@global.flush_time;
@@global.flush_time