diff options
| author | unknown <ingo@mysql.com> | 2006-06-26 19:43:28 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-06-26 19:43:28 +0200 |
| commit | 8fe3c29f84a49d6338a63e53d0ab6c46d8d181a3 (patch) | |
| tree | 3f0cf8c754824d2c2dd7cb52d7d04e7865245b7a /mysys | |
| parent | 90ff8fbd380154b6b1efef259d326185277f007a (diff) | |
| parent | 70c7e30d16bb4599d945a92dd7ca7a8da7c1cec8 (diff) | |
| download | mariadb-git-8fe3c29f84a49d6338a63e53d0ab6c46d8d181a3.tar.gz | |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug16986-main
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_lock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index f5a8b618949..51df50a4926 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -204,6 +204,8 @@ static void check_locks(THR_LOCK *lock, const char *where, { if ((int) data->type == (int) TL_READ_NO_INSERT) count++; + /* Protect against infinite loop. */ + DBUG_ASSERT(count <= lock->read_no_write_count); } if (count != lock->read_no_write_count) { |