diff options
| author | unknown <evgen@sunlight.local> | 2006-03-30 17:14:55 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-03-30 17:14:55 +0400 |
| commit | e0708e2c11b9079fbe85a36fa1790761241b262c (patch) | |
| tree | f1381200f8493f09eb4e5d618305dc65a91312e0 /sql/sql_table.cc | |
| parent | b7f090e402a27b5407e059a019dcefcfec483efd (diff) | |
| parent | ff4de9050149bd1ab1727d7f226e094ddcdcd355 (diff) | |
| download | mariadb-git-e0708e2c11b9079fbe85a36fa1790761241b262c.tar.gz | |
Manual merge
myisam/mi_search.c:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 0fd0c8e25e1..cb556acd5c7 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1798,7 +1798,7 @@ TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, field=item->tmp_table_field(&tmp_table); else field=create_tmp_field(thd, &tmp_table, item, item->type(), - (Item ***) 0, &tmp_field, 0, 0, 0, 0); + (Item ***) 0, &tmp_field, 0, 0, 0, 0, 0); if (!field || !(cr_field=new create_field(field,(item->type() == Item::FIELD_ITEM ? ((Item_field *)item)->field : |