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

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

Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1
73f61e9d · heikki@hundin.mysql.fi · 193310c8 · 917e8b4d · 73f61e9d
Commit 73f61e9d authored Dec 22, 2004 by heikki@hundin.mysql.fi
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/ha_innodb.cc sql/ha_innodb.cc +2 -1

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -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);