diff options
| author | venu@myvenu.com <> | 2003-05-21 00:12:09 -0700 |
|---|---|---|
| committer | venu@myvenu.com <> | 2003-05-21 00:12:09 -0700 |
| commit | 39cbb547d433f7fdcfbe5655f14ffb8c93fe6122 (patch) | |
| tree | 390fab0240f652c5c3ddbf153549ac34cb5c1b2b /sql/sql_load.cc | |
| parent | 9ad75823e7406c3afec09e642615e4821d25df5a (diff) | |
| parent | 666d46b6ee19c0399fadff220952a9ac9a097f85 (diff) | |
| download | mariadb-git-39cbb547d433f7fdcfbe5655f14ffb8c93fe6122.tar.gz | |
Resolve merge colflict
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index c9c0e36ff7b..fa2321a1e9d 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -238,7 +238,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, lf_info.log_delayed= log_delayed; read_info.set_io_cache_arg((void*) &lf_info); } - restore_record(table,2); + restore_record(table,default_values); thd->count_cuted_fields=1; /* calc cuted fields */ thd->cuted_fields=0L; |