diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-06-14 12:43:02 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-06-14 12:43:02 +0300 |
| commit | 6996ef1380fedd666bede013432f4d8d696f0bed (patch) | |
| tree | 84714601d842e05d1068ce331ea9046b08219a9e /mysql-test/suite/innodb/r | |
| parent | 0e5eb364a22cec01d05f756a4fb82c8a2a3353b2 (diff) | |
| parent | 5bc84421f2ae5339914f4563f156877f8d50ca31 (diff) | |
| download | mariadb-git-6996ef1380fedd666bede013432f4d8d696f0bed.tar.gz | |
Merge mysql-5.1 -> mysql-5.1-innodb
(innodb_mysql.result needs to be adjusted after this commit)
Diffstat (limited to 'mysql-test/suite/innodb/r')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index b4ac88fc1c3..497a98c8121 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -2379,15 +2379,3 @@ SECOND(c)-@bug47453 0 DROP TABLE t1, t2; # -# Bug#38999 valgrind warnings for update statement in function compare_record() -# -CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; -CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; -INSERT INTO t1 values (1),(2),(3),(4),(5); -INSERT INTO t2 values (1); -SELECT * FROM t1 WHERE a = 2; -a -2 -UPDATE t1,t2 SET t1.a = t1.a + 100 WHERE t1.a = 1; -DROP TABLE t1,t2; -End of 5.1 tests |