diff options
| author | unknown <monty@donna.mysql.fi> | 2001-05-17 00:46:50 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-05-17 00:46:50 +0300 |
| commit | ebe9b6071a73d6953855fd0b2b5144b5b93194fb (patch) | |
| tree | bfa83a61c2689e0f64e7be02d414bcf366c068a1 /mysys/thr_lock.c | |
| parent | c23dbe674d9cba45aa3ce0b87e50f83f3d2e9d52 (diff) | |
| download | mariadb-git-ebe9b6071a73d6953855fd0b2b5144b5b93194fb.tar.gz | |
Fixed bug when using MERGE on files > 4G
Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
Changed that tmp_table_size =4G-1 means unlimited.
Docs/manual.texi:
Added new section about crashed MyISAM tables.
Cleaned up subsections for InnoDB
client/mysql.cc:
Cleanup
myisam/mi_rkey.c:
Cleanup
myisam/mi_search.c:
Fixed wrong casts in debug messages
myisammrg/myrg_rrnd.c:
Fixed bug when using files > 4G
mysys/getvar.c:
Changed to use longlong to support arguments up to 4G
mysys/thr_lock.c:
Fix for delay insert
sql/mysqld.cc:
Increased default size for temporary tables
sql/sql_base.cc:
Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
sql/sql_insert.cc:
Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
sql/sql_select.cc:
Changed that tmp_table_size =4G-1 means unlimited.
Diffstat (limited to 'mysys/thr_lock.c')
| -rw-r--r-- | mysys/thr_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index ed21d466b35..74548b7fa12 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -370,7 +370,7 @@ static my_bool wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data, do { pthread_cond_wait(cond,&data->lock->mutex); - } while (data->cond == cond && !thread_var->abort); + } while (data->cond == cond && (!thread_var->abort || in_wait_list)); if (data->cond || data->type == TL_UNLOCK) { |