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

Bug#40657: assertion with out of range variables and traditional sql_mode

Browse Source 
normalize error-messages
This commit is contained in:
Tatiana A. Nurnberg
2009-03-11 23:32:53 +01:00
parent cd7d25f4b9
commit e58840fc85
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/variables.result
View File

@ -1421,6 +1421,12 @@ SELECT @@global.expire_logs_days;
@@global.expire_logs_days @@global.expire_logs_days
99 99
SET GLOBAL expire_logs_days = @old_eld; SET GLOBAL expire_logs_days = @old_eld;
SET GLOBAL auto_increment_offset=-1;
Warnings:
Warning 1292 Truncated incorrect auto_increment_offset value: '-1'
SET GLOBAL auto_increment_offset=0;
Warnings:
Warning 1292 Truncated incorrect auto_increment_offset value: '0'
select @@storage_engine; select @@storage_engine;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def @@storage_engine 253 6 6 N 1 31 8 def @@storage_engine 253 6 6 N 1 31 8

5
mysql-test/t/variables.test
View File

@ -1155,6 +1155,11 @@ SELECT @@global.expire_logs_days;
# cleanup # cleanup
SET GLOBAL expire_logs_days = @old_eld; SET GLOBAL expire_logs_days = @old_eld;
# show that warning uses underscore (sysvar-name), not hyphens (option-name)
SET GLOBAL auto_increment_offset=-1;
SET GLOBAL auto_increment_offset=0;
# #
# Bug#41030 Wrong meta data (incorrect fieldlen) # Bug#41030 Wrong meta data (incorrect fieldlen)

5
sql/set_var.cc
View File

@ -1520,9 +1520,10 @@ static bool get_unsigned(THD *thd, set_var *var, ulonglong user_max,
var->save_result.ulonglong_value= getopt_ull_limit_value(var->save_result. var->save_result.ulonglong_value= getopt_ull_limit_value(var->save_result.
ulonglong_value, ulonglong_value,
limits, &fixed); limits, &fixed);
if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE, limits->name, if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE,
var->var->name,
(longlong) unadjusted)) (longlong) unadjusted))
return TRUE; return TRUE;
} }