summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb.result
diff options
context:
space:
mode:
authorunknown <tsmith@ramayana.hindu.god>2007-08-27 14:23:02 -0600
committerunknown <tsmith@ramayana.hindu.god>2007-08-27 14:23:02 -0600
commitad4ee2067349fa7e6d3810b4fe05692cf9b19acf (patch)
tree2eeb8dbda059b22a6ba651bd3bffd9b309ca6267 /mysql-test/r/innodb.result
parent66262046a8965099d6c63b1802d6b5a5f35f58de (diff)
parent048775df13c99d52efb6d66c45f5040450c61b44 (diff)
downloadmariadb-git-ad4ee2067349fa7e6d3810b4fe05692cf9b19acf.tar.gz
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X sql/ha_partition.cc: Auto merged
Diffstat (limited to 'mysql-test/r/innodb.result')
-rw-r--r--mysql-test/r/innodb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 804c4b81c17..a883b434c0b 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -501,7 +501,7 @@ ERROR 23000: Duplicate entry 'test2' for key 'ggid'
select * from t1;
id ggid email passwd
1 this will work
-3 test2 this will work
+4 test2 this will work
select * from t1 where id=1;
id ggid email passwd
1 this will work