diff --git a/mysql-test/columnstore/basic/r/mcs17_procedures_define_call_drop.result b/mysql-test/columnstore/basic/r/mcs17_procedures_define_call_drop.result index e0a97b55a..d2a8cced1 100644 --- a/mysql-test/columnstore/basic/r/mcs17_procedures_define_call_drop.result +++ b/mysql-test/columnstore/basic/r/mcs17_procedures_define_call_drop.result @@ -19,7 +19,7 @@ ERROR 42000: OUT or INOUT argument 1 for routine mcs17_db.proc1 is not a variabl CALL proc1(); ERROR 42000: Incorrect number of arguments for PROCEDURE mcs17_db.proc1; expected 1, got 0 CALL proc1(cnt); -ERROR 42S22: Unknown column 'cnt' in 'field list' +ERROR 42S22: Unknown column 'cnt' in 'CALL' CREATE PROCEDURE proc1 (OUT cnt INT) COMMENT 'comment2' BEGIN SELECT COUNT(*) INTO cnt FROM t1; diff --git a/mysql-test/columnstore/basic/r/mcs31_update_table_negative.result b/mysql-test/columnstore/basic/r/mcs31_update_table_negative.result index 4555d9a57..e298e4e02 100644 --- a/mysql-test/columnstore/basic/r/mcs31_update_table_negative.result +++ b/mysql-test/columnstore/basic/r/mcs31_update_table_negative.result @@ -8,9 +8,9 @@ CREATE TABLE t1 (a INT NOT NULL, b INT) ENGINE=Columnstore; INSERT INTO t1 VALUES (1,1),(1,2),(1,3),(3,1),(3,2); CREATE table t2 LIKE t1; UPDATE t1 SET nonexistingColumn = 1; -ERROR 42S22: Unknown column 'nonexistingColumn' in 'field list' +ERROR 42S22: Unknown column 'nonexistingColumn' in 'SET' UPDATE t2 SET a = (SELECT nonexistingColumn FROM t1); -ERROR 42S22: Unknown column 'nonexistingColumn' in 'field list' +ERROR 42S22: Unknown column 'nonexistingColumn' in 'SELECT' UPDATE t1 SET a = NULL; ERROR HY000: Internal error: CAL0002: Update Failed: MCS-4015: Column 'a' cannot be null. UPDATE t1 SET a = NULL, b =1; diff --git a/mysql-test/columnstore/basic/r/mcs32_delete_table.result b/mysql-test/columnstore/basic/r/mcs32_delete_table.result index d19a02461..5f22a4ea0 100644 --- a/mysql-test/columnstore/basic/r/mcs32_delete_table.result +++ b/mysql-test/columnstore/basic/r/mcs32_delete_table.result @@ -13,7 +13,7 @@ SELECT COUNT(*) FROM t1; COUNT(*) 2 DELETE FROM t1 WHERE unknown = 2; -ERROR 42S22: Unknown column 'unknown' in 'where clause' +ERROR 42S22: Unknown column 'unknown' in 'WHERE' INSERT INTO t1 VALUES (1, NULL); DELETE FROM t1 WHERE b IS NULL; SELECT COUNT(*) FROM t1; diff --git a/mysql-test/columnstore/basic/r/mcs33_select_basic.result b/mysql-test/columnstore/basic/r/mcs33_select_basic.result index 423bb311e..eb2b645fc 100644 --- a/mysql-test/columnstore/basic/r/mcs33_select_basic.result +++ b/mysql-test/columnstore/basic/r/mcs33_select_basic.result @@ -86,5 +86,5 @@ SELECT @x / @y; @x / @y NULL SELECT unknown; -ERROR 42S22: Unknown column 'unknown' in 'field list' +ERROR 42S22: Unknown column 'unknown' in 'SELECT' DROP DATABASE IF EXISTS mcs33_db1; diff --git a/mysql-test/columnstore/basic/r/mcs35_select_group_by.result b/mysql-test/columnstore/basic/r/mcs35_select_group_by.result index eb7dbc28b..e94df43a9 100644 --- a/mysql-test/columnstore/basic/r/mcs35_select_group_by.result +++ b/mysql-test/columnstore/basic/r/mcs35_select_group_by.result @@ -167,5 +167,5 @@ COUNT(*) SELECT COUNT(*) FROM t1 WHERE t1_blob IS NOT NULL OR t1_tinyint IS NULL GROUP BY t1_varchar; ERROR HY000: Internal error: VARBINARY/BLOB in filter or function is not supported. SELECT COUNT(*) FROM t1 GROUP BY t1_tinyint, t1_int, t1_bigint HAVING t1_char = 'b'; -ERROR 42S22: Unknown column 't1_char' in 'having clause' +ERROR 42S22: Unknown column 't1_char' in 'HAVING' DROP DATABASE IF EXISTS mcs35_db1; diff --git a/mysql-test/columnstore/basic/r/mcs36_select_order_by_group_by.result b/mysql-test/columnstore/basic/r/mcs36_select_order_by_group_by.result index a0f55dff5..62b159233 100644 --- a/mysql-test/columnstore/basic/r/mcs36_select_order_by_group_by.result +++ b/mysql-test/columnstore/basic/r/mcs36_select_order_by_group_by.result @@ -76,10 +76,10 @@ spID userid MIN(t1.score) 3 3 3 SELECT t2.userid, MIN(t1.score) FROM t1, t2 WHERE t1.userID=t2.userID GROUP BY unknown ORDER BY t2.userid; -ERROR 42S22: Unknown column 'unknown' in 'group statement' +ERROR 42S22: Unknown column 'unknown' in 'GROUP BY' SELECT t2.userid, MIN(t1.score) FROM t1, t2 WHERE t1.userID=t2.userID GROUP BY t2.userid ORDER BY unknown; -ERROR 42S22: Unknown column 'unknown' in 'order clause' +ERROR 42S22: Unknown column 'unknown' in 'ORDER BY' SELECT t2.userid, MIN(t1.score) FROM t1, t2 WHERE t1.userID=t2.userID GROUP BY t2.userid ORDER BY NULL; userid MIN(t1.score) diff --git a/mysql-test/columnstore/basic/r/mcs65_crossengine_order_by.result b/mysql-test/columnstore/basic/r/mcs65_crossengine_order_by.result index dca8a9ec3..2fdce2a2b 100644 --- a/mysql-test/columnstore/basic/r/mcs65_crossengine_order_by.result +++ b/mysql-test/columnstore/basic/r/mcs65_crossengine_order_by.result @@ -63,11 +63,11 @@ t1_int t1_char t2_int t2_char 3 fffff 3 iii 5 a 5 hhh SELECT * FROM t1, t2 WHERE t1.t1_int = t2.t2_int ORDER BY -1; -ERROR 42S22: Unknown column '???' in 'order clause' +ERROR 42S22: Unknown column '???' in 'ORDER BY' SELECT * FROM t1, t2 WHERE t1.t1_int = t2.t2_int ORDER BY 0; -ERROR 42S22: Unknown column '0' in 'order clause' +ERROR 42S22: Unknown column '0' in 'ORDER BY' SELECT * FROM t1, t2 WHERE t1.t1_int = t2.t2_int ORDER BY 5; -ERROR 42S22: Unknown column '5' in 'order clause' +ERROR 42S22: Unknown column '5' in 'ORDER BY' SELECT * FROM t1 LEFT JOIN t2 ON t1.t1_int = t2.t2_int ORDER BY t1.t1_int DESC; t1_int t1_char t2_int t2_char 7 ggg 7 nnnnn