Commit e6dfed9f authored by unknown's avatar unknown
Browse files

ha_innodb.cc: 

  If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily


sql/ha_innodb.cc:
  If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily
parent fed35d92

sql/ha_innodb.cc

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