database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-20 09:57:37 +02:00
parent 8d6c9ef001 cbb24d9aa5
commit 98dbe3bfaf
142 changed files with 3642 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_load.cc
View File

@@ -23,7 +23,6 @@
#include "sql_priv.h"
#include "unireg.h"
#include "sql_load.h"
#include "sql_load.h"
#include "sql_cache.h" // query_cache_*
#include "sql_base.h" // fill_record_n_invoke_before_triggers
#include <my_dir.h>
@@ -1014,8 +1013,7 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
read_info.row_end[0]=0;
#endif
restore_record(table, s->default_values);
restore_default_record_for_insert(table);
while ((item= it++))
{
Load_data_outvar *dst= item->get_load_data_outvar();
@@ -1128,8 +1126,8 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
thd->progress.max_counter);
}
}
restore_record(table, s->default_values);
restore_default_record_for_insert(table);
while ((item= it++))
{
uint length;
@@ -1283,8 +1281,7 @@ read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
}
#endif
restore_record(table, s->default_values);
restore_default_record_for_insert(table);
while ((item= it++))
{
/* If this line is to be skipped we don't want to fill field or var */