Commit d4e3c827 authored by unknown's avatar unknown
Browse files

sql_plugin.cc: 

  Bug#17196, --default-storage-engine option broken
configure.in:
  This is an alpha


configure.in:
  This is an alpha
sql/sql_plugin.cc:
  Bug#17196, --default-storage-engine option broken
parent 0ca5886f

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/sql_plugin.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;