From c066b3022e9ce6606f6ccc214bbdc3b85a83dfcb Mon Sep 17 00:00:00 2001
From: "marko@hundin.mysql.fi" <>
Date: Fri, 7 May 2004 12:13:45 +0300
Subject: [PATCH] Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1

---
 innobase/row/row0mysql.c   | 2 +-
 mysql-test/r/innodb.result | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index f53a8de2080..bdc47ca0e8e 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -696,7 +696,7 @@ run_again:
 
 	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;
 
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 1a92946bfcd..6a67bbc6f8b 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -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