mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge sql/item_cmpfunc.cc: Auto merged
This commit is contained in:
commit
7b8ec92ecc
2 changed files with 2 additions and 2 deletions
|
@ -967,7 +967,7 @@ get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
|
|||
*is_null= item->null_value;
|
||||
}
|
||||
if (*is_null)
|
||||
return ~(ulonglong) -1;
|
||||
return ~(ulonglong) 0;
|
||||
/*
|
||||
Convert strings to the integer DATE/DATETIME representation.
|
||||
Even if both dates provided in strings we can't compare them directly as
|
||||
|
|
|
@ -164,7 +164,7 @@ uint32 table_def::calc_field_size(uint col, uchar *master_data) const
|
|||
break;
|
||||
}
|
||||
default:
|
||||
length= ~(uint32) -1;
|
||||
length= ~(uint32) 0;
|
||||
}
|
||||
return length;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue