diff options
| author | guilhem@gbichot4.local <> | 2008-02-18 23:29:39 +0100 |
|---|---|---|
| committer | guilhem@gbichot4.local <> | 2008-02-18 23:29:39 +0100 |
| commit | 9e2b31b0268a05a94032ba96c0830536ce983685 (patch) | |
| tree | 7bffd7a5bcb1eea8fb0183e3a4e3a40cf6a783a6 /mysys/thr_lock.c | |
| parent | ccd53222d61d25ae2702d87a3b617a1f835eedc7 (diff) | |
| download | mariadb-git-9e2b31b0268a05a94032ba96c0830536ce983685.tar.gz | |
Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>
value" error even though the value was correct): a C function in my_getopt.c
was taking bool* in parameter and was called from C++ sql_plugin.cc,
but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
mismatches. Fixed, all other occurences of bool in C are removed, future
ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).
Diffstat (limited to 'mysys/thr_lock.c')
| -rw-r--r-- | mysys/thr_lock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 7f7be4835a5..a66836a35f5 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -121,7 +121,7 @@ thr_lock_owner_equal(THR_LOCK_OWNER *rhs, THR_LOCK_OWNER *lhs) static uint found_errors=0; static int check_lock(struct st_lock_list *list, const char* lock_type, - const char *where, my_bool same_owner, bool no_cond) + const char *where, my_bool same_owner, my_bool no_cond) { THR_LOCK_DATA *data,**prev; uint count=0; @@ -708,7 +708,7 @@ end: static inline void free_all_read_locks(THR_LOCK *lock, - bool using_concurrent_insert) + my_bool using_concurrent_insert) { THR_LOCK_DATA *data=lock->read_wait.data; @@ -1062,7 +1062,7 @@ void thr_multi_unlock(THR_LOCK_DATA **data,uint count) TL_WRITE_ONLY to abort any new accesses to the lock */ -void thr_abort_locks(THR_LOCK *lock, bool upgrade_lock) +void thr_abort_locks(THR_LOCK *lock, my_bool upgrade_lock) { THR_LOCK_DATA *data; DBUG_ENTER("thr_abort_locks"); |