diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-09 21:08:56 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-09 21:08:56 +0300 |
| commit | c7105d8008aa42e90e830ede25e7cbf0c22893c0 (patch) | |
| tree | 8f547099445a7673d67da016f7a567772cd5552c /sql/sql_insert.cc | |
| parent | 5dfbb2ca7bc7fff9db96f1f95315c511a7728780 (diff) | |
| download | mariadb-git-c7105d8008aa42e90e830ede25e7cbf0c22893c0.tar.gz | |
Fixed INSERT DELAYED with Innobase
Fix for shutdown on NT
Fixed bug when using wrong dates from blob field.
BitKeeper/deleted/.del-df_crash.result~4a3dbee64843953d:
Delete: mysql-test/r/df_crash.result
BitKeeper/deleted/.del-df_crash.test~4c365178fe437f6:
Delete: mysql-test/t/df_crash.test
Docs/manual.texi:
Changelog
innobase/ib_config.h.in:
automatic changed file
innobase/ib_config.h:
automatic changed file
mysql-test/r/func_time.result:
Test case for bug in time functions
mysql-test/r/innobase.result:
Test for INSERT DELAYED
mysql-test/t/func_time.test:
Test case for bug in time functions
mysql-test/t/innobase.test:
Test for INSERT DELAYED
scripts/mysql_convert_table_format.sh:
Added --socket and --port
sql/ha_innobase.cc:
Fix bug when compiling with SAFE_MUTEX
Cleaner comment when using SHOW TABLE STATUS
sql/mysqld.cc:
Fix for shutdown on NT
sql/sql_insert.cc:
Fixed problem with Innobase and INSERT DELAYED
sql/sql_udf.cc:
Support for UDF on windows
sql/time.cc:
Fixed bug when using wrong dates from blob field.
strings/ctype-tis620.c:
Removed not used variable
support-files/mysql-max.spec.sh:
Removed old not used section
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index d2e7c98333d..3be195b8984 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -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 */ |