Commit 1999186d authored by Timothy Smith's avatar Timothy Smith
Browse files

Cherry-pick one change from innodb-5.1-ss2485 snapshot. Fixes Bug#35602. 

Bug #35602 "Failed to read auto-increment value from storage engine" with
Innodb

The test for REPLACE was an error of ommission since it's classified as
a simple INSERT. For REPLACE statements we don't acquire the special
AUTOINC lock for AUTOINC_NEW_STYLE_LOCKING with this fix.
parent 1a01d6a9

storage/innobase/handler/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -3277,7 +3277,8 @@ ha_innobase::innobase_autoinc_lock(void) 
		old style only if another transaction has already acquired

		the AUTOINC lock on behalf of a LOAD FILE or INSERT ... SELECT

		etc. type of statement. */

		if (thd_sql_command(user_thd) == SQLCOM_INSERT) {

		if (thd_sql_command(user_thd) == SQLCOM_INSERT

		    || thd_sql_command(user_thd) == SQLCOM_REPLACE) {

			dict_table_t*	table = prebuilt->table;



			/* Acquire the AUTOINC mutex. */