Commit 6fa46766 authored by unknown's avatar unknown
Browse files

Merge hundin.mysql.fi:/home/heikki/mysql-4.0 

into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
parents 4e6fb94d e6dfed9f

sql/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -5051,7 +5051,8 @@ ha_innobase::external_lock( 


		if (prebuilt->select_lock_type != LOCK_NONE) {

			if (thd->in_lock_tables &&

			    thd->variables.innodb_table_locks) {

			    thd->variables.innodb_table_locks &&

			    (thd->options & OPTION_NOT_AUTOCOMMIT)) {

				ulint	error;

				error = row_lock_table_for_mysql(prebuilt,

							NULL, LOCK_TABLE_EXP);