diff options
author | Michael Widenius <monty@askmonty.org> | 2011-01-26 15:17:46 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-01-26 15:17:46 +0200 |
commit | 69fe020f01a7eefa9f737291f0da2be56f42a6a0 (patch) | |
tree | 3a66096753a6342dd78d1eef711b722db03de017 /include | |
parent | 26565ae1d6bc02fac641abf2747da23bd1013976 (diff) | |
download | mariadb-git-69fe020f01a7eefa9f737291f0da2be56f42a6a0.tar.gz |
Fixed bugs found by buildbot:
- Use -Wno-uninitialized if -DFORCE_INIT_OF_VARS is not used, to avoid warnings about not initialized variables.
- Fixed compiler warnings
- Added a name for each thr_lock to get better error messages (This is needed to find out why 'archive.test' sometimes fails)
BUILD/SETUP.sh:
Use -Wno-uninitialized if -DFORCE_INIT_OF_VARS is not used, to avoid warnings about not initialized variables.
BUILD/build_mccge.sh:
Use -Wno-uninitialized if -DFORCE_INIT_OF_VARS is not used, to avoid warnings about not initialized variables.
client/mysqltest.cc:
Fixed bug in remove_files_wildcards (the orignal code never removed anything)
extra/libevent/devpoll.c:
Fixed compiler warning
include/thr_lock.h:
Added a name for each thr_lock to get better error messages.
mysql-test/suite/maria/t/maria3.test:
Speed up test.
mysys/thr_lock.c:
Added a name for each thr_lock to get better error messages.
Added a second 'check_locks' to find if something goes wrong in 'wake_up_waiters'.
sql/lock.cc:
Added a name for each thr_lock to get better error messages.
storage/xtradb/fil/fil0fil.c:
Fixed compiler warning
Diffstat (limited to 'include')
-rw-r--r-- | include/thr_lock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/thr_lock.h b/include/thr_lock.h index 08cc8bd5408..111fd5f4cf2 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -123,7 +123,7 @@ typedef struct st_thr_lock_data { struct st_thr_lock *lock; pthread_cond_t *cond; void *status_param; /* Param to status functions */ - void *debug_print_param; + void *debug_print_param; /* Used by MariaDB for TABLE ref */ enum thr_lock_type type; uint priority; } THR_LOCK_DATA; @@ -149,6 +149,7 @@ typedef struct st_thr_lock { my_bool (*start_trans)(void*); /* When all locks are taken */ my_bool (*check_status)(void *); void (*fix_status)(void *, void *);/* For thr_merge_locks() */ + const char *name; /* Used for error reporting */ my_bool allow_multiple_concurrent_insert; } THR_LOCK; |