diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-28 21:22:09 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-28 21:22:09 +0200 |
| commit | 6345cd44184ede58c0b306290b4a2659dc557a08 (patch) | |
| tree | cf3a917852760f89bdab4c3b8b0271e032968278 | |
| parent | 636bb59034fd13d2e1b27af42adbb01ddeb3bd82 (diff) | |
| download | mariadb-git-6345cd44184ede58c0b306290b4a2659dc557a08.tar.gz | |
Fix compile errors
| -rw-r--r-- | plugin/file_key_management/file_key_management_plugin.cc | 1 | ||||
| -rw-r--r-- | sql/sql_test.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugin/file_key_management/file_key_management_plugin.cc b/plugin/file_key_management/file_key_management_plugin.cc index 2804393082e..77344bc57ee 100644 --- a/plugin/file_key_management/file_key_management_plugin.cc +++ b/plugin/file_key_management/file_key_management_plugin.cc @@ -172,6 +172,7 @@ static int file_key_management_plugin_init(void *p) static int file_key_management_plugin_deinit(void *p) { keys.free_memory(); + return 0; } /* diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 86f7dc268b9..50d51dcc8cc 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -54,7 +54,7 @@ static const char *lock_descriptions[] = }; -#ifdef EXTRA_DEBUG +#ifndef DBUG_OFF void print_where(COND *cond,const char *info, enum_query_type query_type) |