diff options
| author | tnurnberg@white.intern.koehntopp.de <> | 2007-12-20 13:42:50 +0100 |
|---|---|---|
| committer | tnurnberg@white.intern.koehntopp.de <> | 2007-12-20 13:42:50 +0100 |
| commit | 22d1a50d5cd61b74a589539d39b7fb5c0d02a113 (patch) | |
| tree | 626256688d414746aedad8ab72da9fbda0051ded | |
| parent | d1637b2ec4fa2c342b63b219ead10e851ccb64e8 (diff) | |
| parent | 284d8c71ee4126b8617e54f06bcffbb36963ccdb (diff) | |
| download | mariadb-git-22d1a50d5cd61b74a589539d39b7fb5c0d02a113.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31990/50-31990
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 47a4097964a..17b6a4a44ab 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9041,7 +9041,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, *((*copy_func)++) = item; // Save for copy_funcs if (modify_item) item->set_result_field(new_field); - if (item->type() == MYSQL_TYPE_NULL) + if (item->type() == Item::NULL_ITEM) new_field->is_created_from_null_item= TRUE; return new_field; } |