diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-07-04 10:12:44 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-07-04 10:12:44 +0300 |
| commit | 0b0c18a09cdfe44905581669f3e40b571ba6973b (patch) | |
| tree | 2a3a3aef7e31251fc00de36d29f1bfb8fcccb978 /mysql-test/t/ps_3innodb.test | |
| parent | f01103184f07d15c9dcedc04f6ecb65b0dcd350b (diff) | |
| parent | 442ba20a9249694999fbba6f0ef2f5061f2cf246 (diff) | |
| download | mariadb-git-0b0c18a09cdfe44905581669f3e40b571ba6973b.tar.gz | |
Merge mysql-5.1-innodb -> mysql-5.1-security
Merge up to sunny.bains@oracle.com-20100625081841-ppulnkjk1qlazh82 .
There are 8 more changesets in mysql-5.1-innodb, but PB2 shows a
failure for a test added in one of them. If that is resolved quickly
then those 8 more changesets will be merged too.
Diffstat (limited to 'mysql-test/t/ps_3innodb.test')
| -rw-r--r-- | mysql-test/t/ps_3innodb.test | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/t/ps_3innodb.test b/mysql-test/t/ps_3innodb.test index 10d2e7a9ae5..e25a8b1f469 100644 --- a/mysql-test/t/ps_3innodb.test +++ b/mysql-test/t/ps_3innodb.test @@ -8,10 +8,6 @@ # NOTE: PLEASE SEE ps_1general.test (bottom) # BEFORE ADDING NEW TEST CASES HERE !!! -# See Bug#38999 valgrind warnings for update statement in function -# compare_record() --- source include/not_valgrind.inc - use test; -- source include/have_innodb.inc |