diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-09-26 19:06:54 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-09-26 19:06:54 +0300 |
| commit | bc25c6cafbb9e8c3b849f8077cd9bd487e000551 (patch) | |
| tree | 72aa6cfe7d2fc332845cce73577dd273ccaa5f64 /sql/sql_insert.cc | |
| parent | c89bc705a9e300d12a64dffe4df89ec3564d76a0 (diff) | |
| download | mariadb-git-bc25c6cafbb9e8c3b849f8077cd9bd487e000551.tar.gz | |
merge of the fix for bug 27802 & 27216 to 5.1-opt
mysql-test/r/view.result:
merge of the fix for bug 27802 to 5.1
sql/item_cmpfunc.h:
merge of the fix for bug 27216 to 5.1
sql/sql_insert.cc:
merge of the fix for bug 27216 to 5.1
sql/sql_lex.h:
merge of the fix for bug 27802 to 5.1
sql/sql_select.cc:
merge of the fix for bug 27802 to 5.1
sql/table.h:
merge of the fix for bug 27802 to 5.1
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 4bac5f9c9da..459eefbf760 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3315,7 +3315,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, if (item->result_type() != STRING_RESULT) field= item->tmp_table_field(&tmp_table); else - field= item->tmp_table_field_from_field_type(&tmp_table); + field= item->tmp_table_field_from_field_type(&tmp_table, 0); else field= create_tmp_field(thd, &tmp_table, item, item->type(), (Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0, |