diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-02-05 00:28:11 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-02-05 00:28:11 -0500 |
| commit | 4cb029b38b914751926c472a3a944fc0e84533be (patch) | |
| tree | 576161865bb4128ef898a823db9ecb6ca30fba62 /include | |
| parent | 7ca53d947959fe420c28400c621f427b3008fe19 (diff) | |
| download | mariadb-git-4cb029b38b914751926c472a3a944fc0e84533be.tar.gz | |
* Merged the missing revision 3934 from
codership-mysql/5.5 (missed in the last merge).
* Merged changes from Innodb to xtradb.
* Updated WSREP_PATCH_REVNO
Diffstat (limited to 'include')
| -rw-r--r-- | include/thr_lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/thr_lock.h b/include/thr_lock.h index 4551a3160ff..f05db666da9 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -22,7 +22,7 @@ extern "C" { #endif #ifdef WITH_WSREP #include <my_sys.h> - typedef int (* wsrep_thd_is_brute_force_fun)(void *); + typedef my_bool (* wsrep_thd_is_brute_force_fun)(void *, my_bool); typedef int (* wsrep_abort_thd_fun)(void *, void *, my_bool); typedef int (* wsrep_on_fun)(void *); void wsrep_thr_lock_init( |