summaryrefslogtreecommitdiff
path: root/mysql-test/r/partition.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r/partition.result')
-rw-r--r--mysql-test/r/partition.result10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index a45a389bab1..29243beefa9 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -300,7 +300,7 @@ create index i on t1 (a);
ERROR 42000: Duplicate key name 'i'
create index i2 on t1 (a);
Warnings:
-Note 1831 Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note 1831 Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
drop table t1;
CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a))
ENGINE=MyISAM
@@ -2467,16 +2467,16 @@ partkey nokey
# Case 1
# Update is refused because partitioning key is updated
UPDATE t1_part AS A NATURAL JOIN t1_part B SET A.partkey = 2, B.nokey = 3;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
UPDATE t1_part AS A NATURAL JOIN t1_part B SET A.nokey = 2, B.partkey = 3;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
# Case 2
# Like 1, but partition accessed through a view
UPDATE t1_part AS A NATURAL JOIN v1 as B SET A.nokey = 2 , B.partkey = 3;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
UPDATE v1 AS A NATURAL JOIN t1_part as B SET A.nokey = 2 , B.partkey = 3;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
# Should be (1,1),(10,10)
SELECT * FROM t1_part;