From d6be5dcecb96042d4aa94530184be99853856789 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Tue, 7 Feb 2006 22:39:55 +0100 Subject: [PATCH] sql_plugin.cc: Bug#17196, --default-storage-engine option broken configure.in: This is an alpha --- configure.in | 2 +- sql/sql_plugin.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 2f5a6cde7c3..ffc311a7857 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.1.6-beta) +AM_INIT_AUTOMAKE(mysql, 5.1.6-alpha) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index b8628b18dd4..9f17694a137 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -345,7 +345,7 @@ struct st_plugin_int *plugin_lock(LEX_STRING *name, int type) rw_wrlock(&THR_LOCK_plugin); if ((rc= plugin_find_internal(name, type))) { - if (rc->state == PLUGIN_IS_READY) + if (rc->state == PLUGIN_IS_READY || rc->state == PLUGIN_IS_UNINITIALIZED) rc->ref_count++; else rc= 0;