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

merge

Browse Source
This commit is contained in:
Ingo Struewing
2008-11-28 12:38:49 +01:00
parent a4abe291dc 710b7125da
commit 8e9e95f2d7
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/perror-win.result
View File

@ -2,4 +2,5 @@ MySQL error code 150: Foreign key constraint is incorrectly formed
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
OS error code 23: Too many open files in system
Win32 error code 23: Data error (cyclic redundancy check).
Win32 error code 15000: The specified channel path is invalid.
Win32 error code 500: User profile cannot be loaded.
Illegal error code: 30000

9
mysql-test/t/perror-win.test
View File

@ -6,6 +6,9 @@ eval select LENGTH("$MY_PERROR") > 0 as "have_perror";
enable_query_log;
--exec $MY_PERROR 150
--exec $MY_PERROR 23
--exec $MY_PERROR 15000
--exec $MY_PERROR 150 2>&1
--exec $MY_PERROR 23 2>&1
--exec $MY_PERROR 500 2>&1
--error 1
--exec $MY_PERROR 30000 2>&1

2
sql/item_func.cc
View File

@ -2259,7 +2259,7 @@ void Item_func_min_max::fix_length_and_dec()
uint Item_func_min_max::cmp_datetimes(ulonglong *value)
{
ulonglong min_max;
longlong min_max;
uint min_max_idx= 0;
LINT_INIT(min_max);