diff options
author | Igor Babaev <igor@askmonty.org> | 2013-07-08 12:55:11 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2013-07-08 12:55:11 -0700 |
commit | f1848be7467ed1708a693e3ba10f6e637763094a (patch) | |
tree | f8359bd08e27b1292d21fb88b02c1b2dc3b7114d | |
parent | 66f1a848f44748ba2fd31c2463f6b73ae45d5f1f (diff) | |
download | mariadb-git-f1848be7467ed1708a693e3ba10f6e637763094a.tar.gz |
Fixed a failure in partition_truncate.test.
-rw-r--r-- | mysql-test/r/partition_truncate.result | 2 | ||||
-rw-r--r-- | mysql-test/t/partition_truncate.test | 2 | ||||
-rw-r--r-- | sql/partition_info.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/partition_truncate.result b/mysql-test/r/partition_truncate.result index 66c0cd3d9da..7a82e47d818 100644 --- a/mysql-test/r/partition_truncate.result +++ b/mysql-test/r/partition_truncate.result @@ -5,7 +5,7 @@ partition by list (a) alter table t1 truncate partition p1,p1; ERROR HY000: Incorrect partition name alter table t1 truncate partition p0; -ERROR HY000: Incorrect partition name +ERROR HY000: Unknown partition 'p0' in table 't1' drop table t1; create table t1 (a int) partition by list (a) diff --git a/mysql-test/t/partition_truncate.test b/mysql-test/t/partition_truncate.test index 165213d204c..62ed548808f 100644 --- a/mysql-test/t/partition_truncate.test +++ b/mysql-test/t/partition_truncate.test @@ -11,7 +11,7 @@ partition by list (a) (partition p1 values in (0)); --error ER_WRONG_PARTITION_NAME alter table t1 truncate partition p1,p1; ---error ER_WRONG_PARTITION_NAME +--error ER_UNKNOWN_PARTITION alter table t1 truncate partition p0; drop table t1; diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 002d5ebca79..1e351b97d8e 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -110,7 +110,7 @@ bool partition_info::add_named_partition(const char *part_name, length); if (!part_def) { -// my_error(ER_UNKNOWN_PARTITION, MYF(0), part_name, table->alias); + my_error(ER_UNKNOWN_PARTITION, MYF(0), part_name, table->alias.c_ptr()); DBUG_RETURN(true); } |