database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge of WL#4738 from mysql-next-mr:

Browse Source 
- backported code that handles %f/%g arguments in 
my_vsnprintf.c from 6.0 
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c 
from 6.0 
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt() 
- removed unnecessary "--replace-result"s for Windows in 
mysql-test/suite/sys_vars/t/long_query_time_basic.test 
- some test results adjustments
This commit is contained in:
Alexey Kopytov
2009-12-28 15:54:16 +03:00
parent ece5ad57e9 31cd0643ae
commit 85d5a08b51
753 changed files with 16228 additions and 15036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/suite/sys_vars/r/long_query_time_basic.result
View File

@ -70,39 +70,47 @@ SELECT @@session.long_query_time;
65550.000000
'#------------------FN_DYNVARS_068_05-----------------------#'
SET @@global.long_query_time = 100000000000;
Warnings:
Warning 1292 Truncated incorrect long_query_time value: '100000000000'
SELECT @@global.long_query_time;
@@global.long_query_time
31536000.000000
SET @@global.long_query_time = -1;
Warnings:
Warning 1292 Truncated incorrect long_query_time value: '-1'
SELECT @@global.long_query_time;
@@global.long_query_time
0.000000
SET @@global.long_query_time = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
SET @@global.long_query_time = 65530.34;
SELECT @@global.long_query_time;
@@global.long_query_time
0.000000
65530.340000
SET @@global.long_query_time = test;
ERROR 42000: Incorrect argument type to variable 'long_query_time'
SELECT @@global.long_query_time;
@@global.long_query_time
0.000000
65530.340000
SET @@session.long_query_time = 100000000000;
Warnings:
Warning 1292 Truncated incorrect long_query_time value: '100000000000'
SELECT @@session.long_query_time;
@@session.long_query_time
31536000.000000
SET @@session.long_query_time = -2;
Warnings:
Warning 1292 Truncated incorrect long_query_time value: '-2'
SELECT @@session.long_query_time;
@@session.long_query_time
0.000000
SET @@session.long_query_time = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@session.long_query_time = 65530.34;
SELECT @@session.long_query_time;
@@session.long_query_time
65530.340000
SET @@session.long_query_time = test;
ERROR 42000: Incorrect argument type to variable 'long_query_time'
SELECT @@session.long_query_time;
@@session.long_query_time
0.000000
65530.340000
'#------------------FN_DYNVARS_068_06-----------------------#'
SELECT @@global.long_query_time = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES