From 2ccf247e939b39d1f84908a56b8717150e5fd1b4 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 12 Dec 2011 23:58:40 +0100 Subject: 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. --- mysql-test/suite/sys_vars/r/flush_time_basic.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/suite/sys_vars/r/flush_time_basic.result') 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 -- cgit v1.2.1