Commit 3adad925 authored by unknown's avatar unknown
Browse files

configure.in: 

  Changed release name to 5.0.19a
ha_innodb.cc:
  InnoDB used table locks (not row locks) within stored functions. (Bug #18077)


sql/ha_innodb.cc:
  InnoDB used table locks (not row locks) within stored functions. (Bug #18077)
configure.in:
  Changed release name to 5.0.19a
parent fb71f423

configure.in

+2 −2
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.0.19)

AM_INIT_AUTOMAKE(mysql, 5.0.19a)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=19

NDB_VERSION_BUILD=19a

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

sql/ha_innodb.cc

+2 −2
Original line number Diff line number Diff line
@@ -6884,8 +6884,8 @@ ha_innobase::store_lock( 


    		if ((lock_type >= TL_WRITE_CONCURRENT_INSERT 

		    && lock_type <= TL_WRITE)

		    && (!thd->in_lock_tables

			|| thd->lex->sql_command == SQLCOM_CALL)

		    && !(thd->in_lock_tables

                         && thd->lex->sql_command == SQLCOM_LOCK_TABLES)

		    && !thd->tablespace_op

		    && thd->lex->sql_command != SQLCOM_TRUNCATE

		    && thd->lex->sql_command != SQLCOM_OPTIMIZE