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

into mysql.com:/home/kostja/mysql/mysql-4.1-root

Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
1be4a37f · konstantin@mysql.com · 02f382ec · c10413ab · 1be4a37f
Commit 1be4a37f authored Dec 02, 2003 by konstantin@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/item.cc sql/item.cc +1 -2

No files found.
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -580,8 +580,7 @@ int Item_param::save_in_field(Field *field, bool no_conversions)
 {
  THD *thd= current_thd;
-  if (thd->command == COM_PREPARE)
+  DBUG_ASSERT(thd->command == COM_EXECUTE);
-    return -1;
  if (null_value)
    return (int) set_field_to_null(field);