sql_plugin.cc:
Bug#17196, --default-storage-engine option broken configure.in: This is an alpha
This commit is contained in:
parent
2a6dcbfa52
commit
d6be5dcecb
@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
|
|||||||
AC_CANONICAL_SYSTEM
|
AC_CANONICAL_SYSTEM
|
||||||
# The Docs Makefile.am parses this line!
|
# The Docs Makefile.am parses this line!
|
||||||
# remember to also change ndb version below and update version.c in ndb
|
# 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)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
PROTOCOL_VERSION=10
|
PROTOCOL_VERSION=10
|
||||||
|
@ -345,7 +345,7 @@ struct st_plugin_int *plugin_lock(LEX_STRING *name, int type)
|
|||||||
rw_wrlock(&THR_LOCK_plugin);
|
rw_wrlock(&THR_LOCK_plugin);
|
||||||
if ((rc= plugin_find_internal(name, type)))
|
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++;
|
rc->ref_count++;
|
||||||
else
|
else
|
||||||
rc= 0;
|
rc= 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user