diff options
| author | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-06-21 17:13:02 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-06-21 17:13:02 +0200 |
| commit | 63d7c4a8c837113be1d1f2b45e02c7cd0aeee4d8 (patch) | |
| tree | 4cebbff86a038e8f7be63238c8a21a11e106bf20 /sql/sql_insert.cc | |
| parent | 3e878beddb0c70e9a8204ce04dfcc92c135c1f39 (diff) | |
| parent | 72253445131fa3033243a9b663f4d88af019c547 (diff) | |
| download | mariadb-git-63d7c4a8c837113be1d1f2b45e02c7cd0aeee4d8.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysys/charset.c:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index fef9b885946..c0efa621422 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3214,7 +3214,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, MYSQL_LOCK **lock, TABLEOP_HOOKS *hooks) { - TABLE tmp_table; // Used during 'create_field()' + TABLE tmp_table; // Used during 'Create_field()' TABLE_SHARE share; TABLE *table= 0; uint select_field_count= items->elements; @@ -3258,7 +3258,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, while ((item=it++)) { - create_field *cr_field; + Create_field *cr_field; Field *field, *def_field; if (item->type() == Item::FUNC_ITEM) field= item->tmp_table_field(&tmp_table); @@ -3267,7 +3267,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, (Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0, 0); if (!field || - !(cr_field=new create_field(field,(item->type() == Item::FIELD_ITEM ? + !(cr_field=new Create_field(field,(item->type() == Item::FIELD_ITEM ? ((Item_field *)item)->field : (Field*) 0)))) DBUG_RETURN(0); |