database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

8
mysql-test/suite/sys_vars/t/long_query_time_basic.test
View File

@ -109,8 +109,7 @@ SET @@global.long_query_time = 100000000000;
SELECT @@global.long_query_time;
SET @@global.long_query_time = -1;
SELECT @@global.long_query_time;
--Error ER_PARSE_ERROR
SET @@global.long_query_time = 65530.34.;
SET @@global.long_query_time = 65530.34;
SELECT @@global.long_query_time;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.long_query_time = test;
@ -120,9 +119,8 @@ SET @@session.long_query_time = 100000000000;
SELECT @@session.long_query_time;
SET @@session.long_query_time = -2;
SELECT @@session.long_query_time;
--Error ER_PARSE_ERROR
SET @@session.long_query_time = 65530.34.;
--echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@session.long_query_time = 65530.34;
SELECT @@session.long_query_time;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.long_query_time = test;