1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Fixed INSERT DELAYED with Innobase

Fix for shutdown on NT
Fixed bug when using wrong dates from blob field.
This commit is contained in:
monty@donna.mysql.fi
2001-04-09 21:08:56 +03:00
parent 3d19a5d4bb
commit 7f21a7a6da
18 changed files with 157 additions and 99 deletions

View File

@@ -225,7 +225,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
break;
}
}
if (lock_type == TL_WRITE_DELAYED && ! table->file->has_transactions())
if (lock_type == TL_WRITE_DELAYED)
{
error=write_delayed(thd,table,duplic,query, thd->query_length, log_on);
query=0;
@@ -888,6 +888,7 @@ static pthread_handler_decl(handle_delayed_insert,arg)
my_pthread_setspecific_ptr(THR_THD, thd) ||
my_pthread_setspecific_ptr(THR_NET, &thd->net))
{
thd->fatal_error=1;
strmov(thd->net.last_error,ER(thd->net.last_errno=ER_OUT_OF_RESOURCES));
goto end;
}
@@ -906,6 +907,12 @@ static pthread_handler_decl(handle_delayed_insert,arg)
thd->fatal_error=1; // Abort waiting inserts
goto end;
}
if (di->table->file->has_transactions())
{
thd->fatal_error=1;
my_error(ER_ILLEGAL_HA, MYF(0), di->table_list->real_name);
goto end;
}
di->table->copy_blobs=1;
/* One can now use this */