diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-20 13:42:50 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-20 13:42:50 +0100 |
| commit | 90dec398a5951da7d13dceed6eac109e0771482e (patch) | |
| tree | 626256688d414746aedad8ab72da9fbda0051ded /sql | |
| parent | 8ba2819f96a23752b63576cad863cab9537179f7 (diff) | |
| parent | 3e2531b9b028c3f9c1c2d4ba9874ad3351273983 (diff) | |
| download | mariadb-git-90dec398a5951da7d13dceed6eac109e0771482e.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31990/50-31990
Diffstat (limited to 'sql')
| -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; } |