diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-05 16:39:03 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-05 16:39:03 -0300 |
| commit | 60a9d9bbb94ac03159bcc2d75b649abb1c9dc956 (patch) | |
| tree | 1fb25244a6b004ddafb31844314b374fe38adf33 /sql/debug_sync.cc | |
| parent | a8c288054efb4de42cefa5bf06bcb487171ed9d3 (diff) | |
| download | mariadb-git-60a9d9bbb94ac03159bcc2d75b649abb1c9dc956.tar.gz | |
Post-merge fix: header is used by the client API. Obvious in retrospect.
Also, update a few cases missed by the initial patch.
client/mysqltest.cc:
Remove trailing comma.
include/my_alloc.h:
Do not use wrapper.
include/mysql.h.pp:
Update ABI file.
plugin/semisync/semisync_master.h:
Initialize variable.
sql/debug_sync.cc:
Use C linkage.
Diffstat (limited to 'sql/debug_sync.cc')
| -rw-r--r-- | sql/debug_sync.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index d16fa4b2468..dde6267331f 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -387,6 +387,13 @@ static st_debug_sync_globals debug_sync_global; /* All globals in one object */ */ extern "C" void (*debug_sync_C_callback_ptr)(const char *, size_t); +/** + Callbacks from C files. +*/ +C_MODE_START +static void debug_sync_C_callback(const char *, size_t); +static int debug_sync_qsort_cmp(const void *, const void *); +C_MODE_END /** Callback for debug sync, to be used by C files. See thr_lock.c for example. @@ -422,8 +429,8 @@ extern "C" void (*debug_sync_C_callback_ptr)(const char *, size_t); static void debug_sync_C_callback(const char *sync_point_name, size_t name_len) { - if (unlikely(opt_debug_sync_timeout)) - debug_sync(current_thd, sync_point_name, name_len); + if (unlikely(opt_debug_sync_timeout)) + debug_sync(current_thd, sync_point_name, name_len); } #ifdef HAVE_PSI_INTERFACE |