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 /client | |
| 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 'client')
| -rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index d0c948e67bb..0312a0a030b 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -87,7 +87,7 @@ enum { OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION, OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL, OPT_MAX_CONNECT_RETRIES, OPT_MAX_CONNECTIONS, OPT_MARK_PROGRESS, - OPT_LOG_DIR, OPT_TAIL_LINES, OPT_RESULT_FORMAT_VERSION, + OPT_LOG_DIR, OPT_TAIL_LINES, OPT_RESULT_FORMAT_VERSION }; static int record= 0, opt_sleep= -1; |