Fix compile errors

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;
 }
 
 /*

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)