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:
commit
1be4a37fa2
@ -580,8 +580,7 @@ int Item_param::save_in_field(Field *field, bool no_conversions)
|
||||
{
|
||||
THD *thd= current_thd;
|
||||
|
||||
if (thd->command == COM_PREPARE)
|
||||
return -1;
|
||||
DBUG_ASSERT(thd->command == COM_EXECUTE);
|
||||
|
||||
if (null_value)
|
||||
return (int) set_field_to_null(field);
|
||||
|
Loading…
x
Reference in New Issue
Block a user