diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-12-09 13:34:57 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-12-09 13:34:57 -0400 |
| commit | 32441953a75d036ead5c6b7c53de5a7e24021332 (patch) | |
| tree | fe11c6fb8677734a353d4270de5e1bacc7875fb6 /sql | |
| parent | adc470c290a89913aa47e7ab9fcb658f560a5d37 (diff) | |
| parent | 72699882bd149b3c4da5c2a85d78a7ab8db91f1d (diff) | |
| download | mariadb-git-32441953a75d036ead5c6b7c53de5a7e24021332.tar.gz | |
Merge
mysql-test/t/create.test:
Auto merged
mysql-test/r/create.result:
SCCS merged
sql/sql_select.cc:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 3d2a572c3a9..0bf493ee953 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4734,6 +4734,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, return 0; // Error } case Item::FIELD_ITEM: + case Item::DEFAULT_VALUE_ITEM: return create_tmp_field_from_field(thd, (*from_field= ((Item_field*) item)->field), item, table, modify_item); |