diff options
| author | unknown <monty@narttu.mysql.fi> | 2008-02-21 02:51:51 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2008-02-21 02:51:51 +0200 |
| commit | 33c24d59f49f783a50b7a7374fb31bbd67e6d462 (patch) | |
| tree | 5a8d48b69b5cf1c039cbb34fb6fa62583e7a6c22 /storage/maria/lockman.c | |
| parent | 2e5a7aadc66bdca8e4b2d1f770403073d13773eb (diff) | |
| parent | df843c4ce26e2c5d152098302b209252c712382e (diff) | |
| download | mariadb-git-33c24d59f49f783a50b7a7374fb31bbd67e6d462.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
dbug/dbug.c:
Auto merged
mysys/lf_alloc-pin.c:
Auto merged
storage/maria/lockman.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_recovery.c:
Auto merged
storage/maria/unittest/ma_test_recovery.pl:
Manual merge
Diffstat (limited to 'storage/maria/lockman.c')
| -rw-r--r-- | storage/maria/lockman.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/lockman.c b/storage/maria/lockman.c index 8146cc6fc8c..e7f3c81b0fd 100644 --- a/storage/maria/lockman.c +++ b/storage/maria/lockman.c @@ -631,7 +631,7 @@ enum lockman_getlock_result lockman_getlock(LOCKMAN *lm, LOCK_OWNER *lo, /* a new value was added to the hash */ csize= lm->size; if ((my_atomic_add32(&lm->count, 1)+1.0) / csize > MAX_LOAD) - my_atomic_cas32(&lm->size, &csize, csize*2); + my_atomic_cas32(&lm->size, (int*) &csize, csize*2); node->lonext= lo->all_locks; lo->all_locks= node; for ( ; res & NEED_TO_WAIT; res= lockpeek(el, node, pins, &blocker)) |