Commit 75527989 authored by mkindahl@dl145h.mysql.com's avatar mkindahl@dl145h.mysql.com

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
parents 2a864d1f 31355747
...@@ -967,7 +967,7 @@ get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg, ...@@ -967,7 +967,7 @@ get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
*is_null= item->null_value; *is_null= item->null_value;
} }
if (*is_null) if (*is_null)
return ~(ulonglong) -1; return ~(ulonglong) 0;
/* /*
Convert strings to the integer DATE/DATETIME representation. Convert strings to the integer DATE/DATETIME representation.
Even if both dates provided in strings we can't compare them directly as 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 ...@@ -164,7 +164,7 @@ uint32 table_def::calc_field_size(uint col, uchar *master_data) const
break; break;
} }
default: default:
length= ~(uint32) -1; length= ~(uint32) 0;
} }
return length; return length;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment