diff options
author | unknown <monty@mysql.com> | 2004-06-01 23:39:39 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-06-01 23:39:39 +0300 |
commit | bcbaa6a6f2b8b5b57e53172e7ecc7e5098b53f9e (patch) | |
tree | e6638a944a24b46bb485e09bf3ec6613ab1dfd0d /sql/sql_insert.cc | |
parent | 740b71e23574f354dde0d9c6c43960a1a5e82962 (diff) | |
download | mariadb-git-bcbaa6a6f2b8b5b57e53172e7ecc7e5098b53f9e.tar.gz |
Removed compiler warnings
libmysqld/Makefile.am:
Removed define that is now defined by configure and my_global.h
mysql-test/r/func_gconcat.result:
Fixed test result after removing end space
sql/share/romanian/errmsg.txt:
Fixed wrong error message
sql/sql_insert.cc:
Removed compiler warning
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 5b1b18e80e4..037dd99d3b6 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1199,7 +1199,8 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) /* request for new delayed insert */ if (!(thd->lock=mysql_lock_tables(thd,&di->table,1))) { - di->dead=thd->killed=1; // Fatal error + di->dead= 1; // Some fatal error + thd->killed= 1; } pthread_cond_broadcast(&di->cond_client); } @@ -1207,7 +1208,8 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) { if (di->handle_inserts()) { - di->dead=thd->killed=1; // Some fatal error + di->dead= 1; // Some fatal error + thd->killed= 1; } } di->status=0; @@ -1234,7 +1236,8 @@ end: close_thread_tables(thd); // Free the table di->table=0; - di->dead=thd->killed=1; // If error + di->dead= 1; // If error + thd->killed= 1; pthread_cond_broadcast(&di->cond_client); // Safety pthread_mutex_unlock(&di->mutex); |