diff options
| author | unknown <ingo@mysql.com> | 2006-07-04 10:02:11 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-07-04 10:02:11 +0200 |
| commit | 83d20ff710381d67999746601cae2d8715a78775 (patch) | |
| tree | 0d83d5fae0e2ee575858f6cd66a909db278d2c56 /mysys | |
| parent | b0d8c39cddd44884646da9c519f493f057ef3909 (diff) | |
| parent | b4df148766072f0fea45ffe25d1b155e4444d88e (diff) | |
| download | mariadb-git-83d20ff710381d67999746601cae2d8715a78775.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
into mysql.com:/home/mydev/mysql-5.1-amerge
mysys/thr_lock.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/r/lock_multi.result:
Manual merge
mysql-test/t/lock_multi.test:
Manual merge
sql/lock.cc:
Manual merge
sql/sql_base.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
sql/sql_table.cc:
Manual merge
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 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) { |