mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
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
0e286c9028
1 changed files with 1 additions and 2 deletions
|
@ -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);
|
||||||
|
|
Loading…
Add table
Reference in a new issue