Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-root
This commit is contained in:
unknown 2003-12-02 18:06:25 +03:00
commit 0e286c9028

View file

@ -580,8 +580,7 @@ int Item_param::save_in_field(Field *field, bool no_conversions)
{ {
THD *thd= current_thd; THD *thd= current_thd;
if (thd->command == COM_PREPARE) DBUG_ASSERT(thd->command == COM_EXECUTE);
return -1;
if (null_value) if (null_value)
return (int) set_field_to_null(field); return (int) set_field_to_null(field);