summaryrefslogtreecommitdiff
path: root/mysql-test/suite/parts/t
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2010-10-01 15:59:07 +0200
committerMattias Jonsson <mattias.jonsson@oracle.com>2010-10-01 15:59:07 +0200
commit199fb36567b25025e764e48c170063635f2e7547 (patch)
tree764a51a4ea3b8ec8b3e01fc2779d84dc354e199d /mysql-test/suite/parts/t
parent141d83127d30795837238618dae537111eea29de (diff)
parent2a67a3a7f5ec9339fd0c31aa7071f32e3b8a75de (diff)
downloadmariadb-git-199fb36567b25025e764e48c170063635f2e7547.tar.gz
Manual merge into mysql-5.5-bugteam
Diffstat (limited to 'mysql-test/suite/parts/t')
-rw-r--r--mysql-test/suite/parts/t/partition_special_innodb.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/parts/t/partition_special_innodb.test b/mysql-test/suite/parts/t/partition_special_innodb.test
index 9c26ab6fdb4..1c36299f4bd 100644
--- a/mysql-test/suite/parts/t/partition_special_innodb.test
+++ b/mysql-test/suite/parts/t/partition_special_innodb.test
@@ -111,7 +111,7 @@ LOCK TABLE t1 READ;
--echo # Third attempt: says that the table does not exist
--error ER_LOCK_WAIT_TIMEOUT
ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
---echo # Check table returns the same
+--echo # Check table returns the same (not after fixing bug#56172!)
CHECK TABLE t1;
--connection con1