diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-05-07 12:17:11 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-05-07 12:17:11 +0300 |
| commit | bd4be3f1b99c53c260c6ec4cf26d77d1742b7e91 (patch) | |
| tree | 89a0792f47ae1e665fc96779827a23b17aa5a7ed | |
| parent | 146019b593e9806a80863bb55c06dd3cbfcd34d9 (diff) | |
| parent | 95600183df8678f6b158d91e11d018fe24678696 (diff) | |
| download | mariadb-git-bd4be3f1b99c53c260c6ec4cf26d77d1742b7e91.tar.gz | |
Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
| -rw-r--r-- | innobase/row/row0mysql.c | 2 | ||||
| -rw-r--r-- | 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 |