database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 4.1 into 5.0

Browse Source
This commit is contained in:
pem@mysql.com
2003-08-26 11:51:09 +02:00
parent 5b28d4a9a4 6f60424629
commit 7f158dd12a
126 changed files with 7642 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_load.cc
View File

@@ -321,9 +321,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted,
(ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
send_ok(thd,info.copied+info.deleted,0L,name);
// on the slave thd->query is never initialized
if (!thd->slave_thread)
mysql_update_log.write(thd,thd->query,thd->query_length);
if (!log_delayed)
thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
@@ -384,7 +381,7 @@ read_fixed_length(THD *thd,COPY_INFO &info,TABLE *table,List<Item> &fields,
{
if (thd->killed)
{
my_error(ER_SERVER_SHUTDOWN,MYF(0));
thd->send_kill_message();
DBUG_RETURN(1);
}
it.rewind();
@@ -472,7 +469,7 @@ read_sep_field(THD *thd,COPY_INFO &info,TABLE *table,
{
if (thd->killed)
{
my_error(ER_SERVER_SHUTDOWN,MYF(0));
thd->send_kill_message();
DBUG_RETURN(1);
}
while ((sql_field=(Item_field*) it++))