diff options
author | Michael Widenius <monty@askmonty.org> | 2010-11-03 14:14:02 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2010-11-03 14:14:02 +0200 |
commit | 5b3159dbc797f7254b4850813c3bf3dfbbf66623 (patch) | |
tree | 223c6063c688fe55811b5fe19d889326a11b835e /mysys | |
parent | 20acfbf30da2eca66f9e5d602d50ac18e38272b8 (diff) | |
download | mariadb-git-5b3159dbc797f7254b4850813c3bf3dfbbf66623.tar.gz |
Fixed compiler & valgrind warnings from my previous push.
Fixed a bug in Aria when two threads was inserting into the same table and row page and one thread did an abort becasue of duplicate key.
mysys/thr_lock.c:
Fixed valgrind warning
sql/sql_base.cc:
Remove not used variable
storage/maria/ma_bitmap.c:
Added ma_bitmap_lock() & ma_bitmap_unlock() to protect against two threads using the bitmap at the same time.
More DBUG_PRINT()
storage/maria/ma_blockrec.c:
Fixed a bug in Aria when two threads was inserting into the same table and row page and one thread did an abort becasue of duplicate key.
Fix was that we block other threads to modify the bitmap while we are removing the row with a duplicate key.
storage/maria/ma_blockrec.h:
Added ma_bitmap_lock() & ma_bitmap_unlock() to protect against two threads using the bitmap at the same time.
storage/maria/maria_def.h:
Changed flush_all_requested to be a counter.
storage/myisam/mi_locking.c:
Fixed compiler error on windows (typo).
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/thr_lock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 9c8236ae0e6..341b2f0058e 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -406,6 +406,7 @@ void thr_lock_data_init(THR_LOCK *lock,THR_LOCK_DATA *data, void *param) data->owner= 0; /* no owner yet */ data->status_param=param; data->cond=0; + data->priority= 0; } |