summaryrefslogtreecommitdiff
path: root/mysys/thr_lock.c
diff options
context:
space:
mode:
authoringo@mysql.com <>2006-07-04 10:02:11 +0200
committeringo@mysql.com <>2006-07-04 10:02:11 +0200
commitd8546d07f803e7f3dad1e934b3dfd9fba646becd (patch)
tree0d83d5fae0e2ee575858f6cd66a909db278d2c56 /mysys/thr_lock.c
parent267aeffca33581590b5123133e981a7135c7cce4 (diff)
parent50477229b4159b67be2943012241a1c1b3df8a7b (diff)
downloadmariadb-git-d8546d07f803e7f3dad1e934b3dfd9fba646becd.tar.gz
Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
into mysql.com:/home/mydev/mysql-5.1-amerge
Diffstat (limited to 'mysys/thr_lock.c')
-rw-r--r--mysys/thr_lock.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 74d6f7431a8..36cb83ae754 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)
{