Fix compile errors

6345cd44 · Vladislav Vaintroub · 636bb590 · 6345cd44 · 6345cd44
Commit 6345cd44 authored Apr 28, 2016 by Vladislav Vaintroub
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

plugin/file_key_management/file_key_management_plugin.cc plugin/file_key_management/file_key_management_plugin.cc +1 -0

sql/sql_test.cc sql/sql_test.cc +1 -1

No files found.
--- 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;
 }
 /*

--- 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)