Commit 95600183 authored by unknown's avatar unknown
Browse files

Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1 


innobase/row/row0mysql.c:
  Revert accidental modification to row_lock_table_autoinc_for_mysql()
  made in ChangeSet@1.1794.1.1
mysql-test/r/innodb.result:
  Revert ChangeSet@1.1794.1.1
parent ae2b73a5

innobase/row/row0mysql.c

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ row_lock_table_autoinc_for_mysql( 


	trx_start_if_not_started(trx);



	err = lock_table(0, prebuilt->table, prebuilt->select_lock_type, thr);

	err = lock_table(0, prebuilt->table, LOCK_AUTO_INC, thr);



	trx->error_state = err;

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ Duplicate entry 'test2' for key 2 
select * from t1;

id	ggid	email	passwd

1	this will work		

4	test2		this will work

3	test2		this will work

select * from t1 where id=1;

id	ggid	email	passwd

1	this will work