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 mysql.com:/home/ram/work/mysql-5.0-maint

Browse Source 
into  mysql.com:/home/ram/work/b26851/b26851.5.0
This commit is contained in:
unknown
2007-04-19 15:02:36 +05:00
parent 30f3f3a037 5198d0b4a8
commit 0a3533ff57
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1391,4 +1391,10 @@ create table t1 (f1 set('a','a'));
ERROR HY000: Column 'f1' has duplicated value 'a' in SET ERROR HY000: Column 'f1' has duplicated value 'a' in SET
create table t1 (f1 enum('a','a')); create table t1 (f1 enum('a','a'));
ERROR HY000: Column 'f1' has duplicated value 'a' in ENUM ERROR HY000: Column 'f1' has duplicated value 'a' in ENUM
set @@sql_mode='NO_ZERO_DATE';
create table t1(a datetime not null);
select count(*) from t1 where a is null;
count(*)
0
drop table t1;
End of 5.0 tests End of 5.0 tests

8
mysql-test/t/strict.test
View File

@ -1258,4 +1258,12 @@ create table t1 (f1 set('a','a'));
--error 1291 --error 1291
create table t1 (f1 enum('a','a')); create table t1 (f1 enum('a','a'));
#
# Bug #22824: strict, datetime, NULL, wrong warning
#
set @@sql_mode='NO_ZERO_DATE';
create table t1(a datetime not null);
select count(*) from t1 where a is null;
drop table t1;
--echo End of 5.0 tests --echo End of 5.0 tests

3
sql/item_cmpfunc.cc
View File

@ -316,7 +316,8 @@ static bool convert_constant_item(THD *thd, Field *field, Item **item)
{ {
/* For comparison purposes allow invalid dates like 2000-01-32 */ /* For comparison purposes allow invalid dates like 2000-01-32 */
ulong orig_sql_mode= thd->variables.sql_mode; ulong orig_sql_mode= thd->variables.sql_mode;
thd->variables.sql_mode|= MODE_INVALID_DATES; thd->variables.sql_mode= (orig_sql_mode & ~MODE_NO_ZERO_DATE) |
MODE_INVALID_DATES;
if (!(*item)->save_in_field(field, 1) && !((*item)->null_value)) if (!(*item)->save_in_field(field, 1) && !((*item)->null_value))
{ {
Item *tmp=new Item_int_with_ref(field->val_int(), *item, Item *tmp=new Item_int_with_ref(field->val_int(), *item,