diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-25 13:19:46 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-25 13:19:46 +0200 |
| commit | 4b260ea42ede6a0c30fa45a4aab6e56788538d25 (patch) | |
| tree | 088681536e968628003ae711fd14a8df01b404ac /sql/sql_load.cc | |
| parent | a76f62bb0ff3364c8e1cafd443ded508f972f252 (diff) | |
| parent | d94eecbb92305f366983d938f3de586a7832a3c3 (diff) | |
| download | mariadb-git-4b260ea42ede6a0c30fa45a4aab6e56788538d25.tar.gz | |
merging
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_olap.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 71d8a3e181b..49b4f2f7c2f 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -119,7 +119,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, else { // Part field list thd->dupp_field=0; - if (setup_tables(table_list) || setup_fields(thd,table_list,fields,1,0,0)) + if (setup_tables(table_list) || + setup_fields(thd, 0, table_list, fields, 1, 0, 0)) DBUG_RETURN(-1); if (thd->dupp_field) { |