diff options
| author | unknown <igor@rurik.mysql.com> | 2006-04-01 02:57:56 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-04-01 02:57:56 -0800 |
| commit | a5abc598e5efe21b3599e6f4fda9ab02f6194be3 (patch) | |
| tree | de80900626c18453d590c01fd12d6b92f474cdeb /sql/sql_table.cc | |
| parent | d5db81aa34da471ab1f4cd84317e85ec83f42fdf (diff) | |
| parent | f0bfea2bb0789bd5bcd2a8d85c42dd310e245d1a (diff) | |
| download | mariadb-git-a5abc598e5efe21b3599e6f4fda9ab02f6194be3.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/field.cc:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
strings/ctype-ucs2.c:
Auto merged
tests/mysql_client_test.c:
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 633558de914..ed875d321bc 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2464,7 +2464,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 : |