Automerge

sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysqlslap.c:
  SCCS merged
configure.in:
  SCCS merged
libmysql/libmysql.c:
  SCCS merged
mysys/my_init.c:
  SCCS merged

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 8c5579d978b..199cf4a6264 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -518,7 +518,7 @@ static int plugin_initialize(struct st_plugin_int *plugin)
       sql_print_error("Plugin '%s' init function returned error.",
                       plugin->name.str);
       DBUG_PRINT("warning", ("Plugin '%s' init function returned error.",
-                             plugin->name.str))
+                             plugin->name.str));
       goto err;
     }
   }
@@ -531,7 +531,7 @@ static int plugin_initialize(struct st_plugin_int *plugin)
       sql_print_error("Plugin '%s' handlerton init returned error.",
                       plugin->name.str);
       DBUG_PRINT("warning", ("Plugin '%s' handlerton init returned error.",
-                             plugin->name.str))
+                             plugin->name.str));
       goto err;
     }
     break;
@@ -580,7 +580,7 @@ static void plugin_call_deinitializer(void)
         if (tmp->plugin->deinit())
         {
           DBUG_PRINT("warning", ("Plugin '%s' deinit function returned error.",
-                                 tmp->name.str))
+                                 tmp->name.str));
         }
       }
       tmp->state= PLUGIN_IS_UNINITIALIZED;