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 /mysql-test | |
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
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
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 |