1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge marko@build.mysql.com:/home/bk/mysql-4.0

Browse Source 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
This commit is contained in:
marko@hundin.mysql.fi 2004-05-07 12:17:11 +03:00
commit dd9a517e53
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
innobase/row/row0mysql.c
View File

@ -696,7 +696,7 @@ run_again:
trx_start_if_not_started(trx); 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; trx->error_state = err;

2
mysql-test/r/innodb.result
View File

@ -431,7 +431,7 @@ Duplicate entry 'test2' for key 2
select * from t1; select * from t1;
id ggid email passwd id ggid email passwd
1 this will work 1 this will work
4 test2 this will work 3 test2 this will work
select * from t1 where id=1; select * from t1 where id=1;
id ggid email passwd id ggid email passwd
1 this will work 1 this will work