diff options
| author | konstantin@mysql.com <> | 2003-12-02 18:06:25 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2003-12-02 18:06:25 +0300 |
| commit | 1be4a37fa2762cf4ffd484d0c7e48b20a2fa2c8e (patch) | |
| tree | f20e7a5333b964bbe9cd197da9db3d7bd34cde24 | |
| parent | 02f382ecaa7b60c4da4a25434cdf80f2631e0b80 (diff) | |
| parent | c10413abdab41532ba82a8d7763a36d8ed47ccf7 (diff) | |
| download | mariadb-git-1be4a37fa2762cf4ffd484d0c7e48b20a2fa2c8e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
| -rw-r--r-- | sql/item.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 1d49671ff4c..9af2c300202 100644 --- 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) - return -1; + DBUG_ASSERT(thd->command == COM_EXECUTE); if (null_value) return (int) set_field_to_null(field); |