diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-12-20 11:24:42 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-12-20 11:24:42 +0100 |
| commit | 34e0938bfce5ede5dce0dcde894ca8071e1d68b2 (patch) | |
| tree | 191f87db1f4e2c160307c9c68b19cae6453d398d /sql/sql_select.cc | |
| parent | 515a4649caa140d51db270666aee6952146dba6a (diff) | |
| parent | ed9ed6f28b96126774b6036dfccf5ca596b638c5 (diff) | |
| download | mariadb-git-34e0938bfce5ede5dce0dcde894ca8071e1d68b2.tar.gz | |
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -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; } |