Skip to content

Commit 3a1cf2c

Browse files
vuvovavuvova
committed
MDEV-34679 ER_BAD_FIELD uses non-localizable substrings
1 parent 9917831 commit 3a1cf2c

File tree

349 files changed

+1218
-1796
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

349 files changed

+1218
-1796
lines changed

‎mysql-test/main/alias.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA',
5959
Kundentyp kategorie
6060
Privat (Private Nutzung) Mobilfunk
6161
Warnings:
62-
Warning 1052 Column 'kundentyp' in group statement is ambiguous
62+
Warning 1052 Column 'kundentyp' in GROUP BY is ambiguous
6363
drop table t1;
6464
CREATE TABLE t1 (
6565
AUFNR varchar(12) NOT NULL default '',

‎mysql-test/main/alter_table.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
712712
alter table table_24562 order by (select 12 from dual);
713713
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select 12 from dual)' at line 1
714714
alter table table_24562 order by no_such_col;
715-
ERROR 42S22: Unknown column 'no_such_col' in 'order clause'
715+
ERROR 42S22: Unknown column 'no_such_col' in 'ORDER BY'
716716
drop table table_24562;
717717
create table t1 (mycol int(10) not null);
718718
alter table t1 alter column mycol set default 0;

‎mysql-test/main/alter_table_combinations.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function
228228
UPDATE t2 SET f = f + 10;
229229
ERROR 42S22: Unknown column 'd' in 'OLD'
230230
CALL sp1();
231-
ERROR 42S22: Unknown column 'd' in 'field list'
231+
ERROR 42S22: Unknown column 'd' in 'INSERT INTO'
232232
DROP TRIGGER trg1;
233233
DROP PROCEDURE sp1;
234234
CREATE TABLE t_gen(a INT, b DOUBLE GENERATED ALWAYS AS (SQRT(a)));

‎mysql-test/main/analyze_stmt.result

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,17 +204,17 @@ drop table t0, t1;
204204
create table t1 (i int);
205205
insert into t1 values (1),(2);
206206
analyze select a from t1;
207-
ERROR 42S22: Unknown column 'a' in 'field list'
207+
ERROR 42S22: Unknown column 'a' in 'SELECT'
208208
analyze delete from t1 where a=2;
209-
ERROR 42S22: Unknown column 'a' in 'where clause'
209+
ERROR 42S22: Unknown column 'a' in 'WHERE'
210210
analyze update t1 set a=2;
211-
ERROR 42S22: Unknown column 'a' in 'field list'
211+
ERROR 42S22: Unknown column 'a' in 'SET'
212212
create table t2 like t1;
213213
insert into t2 select * from t1;
214214
analyze update t2,t1 set t2.i=5 where t2.a=t1.a;
215-
ERROR 42S22: Unknown column 't2.a' in 'where clause'
215+
ERROR 42S22: Unknown column 't2.a' in 'WHERE'
216216
analyze delete t1 from t2,t1 where t2.a=t1.a;
217-
ERROR 42S22: Unknown column 't2.a' in 'where clause'
217+
ERROR 42S22: Unknown column 't2.a' in 'WHERE'
218218
drop table t1, t2;
219219
#
220220
# MDEV-6395: ANALYZE UPDATE/DELETE with impossible where does not produce any output

‎mysql-test/main/compress.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2162,7 +2162,7 @@ SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA',
21622162
Kundentyp kategorie
21632163
Privat (Private Nutzung) Mobilfunk
21642164
Warnings:
2165-
Warning 1052 Column 'kundentyp' in group statement is ambiguous
2165+
Warning 1052 Column 'kundentyp' in GROUP BY is ambiguous
21662166
drop table t1;
21672167
SHOW STATUS LIKE 'Compression';
21682168
Variable_name Value

‎mysql-test/main/cte_nonrecursive.result

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ ERROR HY000: No anchors for recursive WITH element 's'
750750
#erroneous definition of unreferenced with table t
751751
with t as (select count(*) from t1 where d>='f' group by a)
752752
select t1.b from t2,t1 where t1.a = t2.c;
753-
ERROR 42S22: Unknown column 'd' in 'where clause'
753+
ERROR 42S22: Unknown column 'd' in 'WHERE'
754754
with t as (select count(*) from t1 where b>='f' group by a)
755755
select t1.b from t2,t1 where t1.a = t2.c;
756756
b
@@ -762,11 +762,11 @@ ggg
762762
with t(d) as (select count(*) from t1 where b<='ccc' group by b),
763763
s as (select * from t1 where a in (select t2.d from t2,t where t2.c=t.d))
764764
select t1.b from t1,t2 where t1.a=t2.c;
765-
ERROR 42S22: Unknown column 't2.d' in 'field list'
765+
ERROR 42S22: Unknown column 't2.d' in 'SELECT'
766766
with t(d) as (select count(*) from t1 where b<='ccc' group by b),
767767
s as (select * from t1 where a in (select t2.c from t2,t where t2.c=t.c))
768768
select t1.b from t1,t2 where t1.a=t2.c;
769-
ERROR 42S22: Unknown column 't.c' in 'where clause'
769+
ERROR 42S22: Unknown column 't.c' in 'WHERE'
770770
with t(d) as (select count(*) from t1 where b<='ccc' group by b),
771771
s as (select * from t1 where a in (select t2.c from t2,t where t2.c=t.d))
772772
select t1.b from t1,t2 where t1.a=t2.c;
@@ -1889,13 +1889,13 @@ cte1(a) as (select * from t1 where c1 <= 2),
18891889
cte2(b) as (select * from cte1 where c1 >= 2),
18901890
cte3 as (select * from cte1,cte2 where cte1.a < cte2.b)
18911891
select * from t2;
1892-
ERROR 42S22: Unknown column 'c1' in 'where clause'
1892+
ERROR 42S22: Unknown column 'c1' in 'WHERE'
18931893
with
18941894
cte1(a) as (select * from t1 where c1 <= 2),
18951895
cte2(b) as (select * from cte1 where a >= 2),
18961896
cte3 as (select * from cte1,cte2 where cte1.a < cte2.c1)
18971897
select * from t2;
1898-
ERROR 42S22: Unknown column 'cte2.c1' in 'where clause'
1898+
ERROR 42S22: Unknown column 'cte2.c1' in 'WHERE'
18991899
with
19001900
cte1 as (select * from t1 where c1 <= 2),
19011901
cte2(a,b) as (select * from cte1 as s1, cte1 as s2 where s1.c1=s2.c1)
@@ -1914,7 +1914,7 @@ with
19141914
cte1 as (select * from t1 where c1 <= 2),
19151915
cte2(a,b) as (select * from cte1 as s1, cte1 as s2 where s1.c1=c1)
19161916
select * from t2;
1917-
ERROR 23000: Column 'c1' in where clause is ambiguous
1917+
ERROR 23000: Column 'c1' in WHERE is ambiguous
19181918
with cte3 as
19191919
( with cte2(a,b) as
19201920
( with cte1 as (select * from t1 where c1 <= 2)
@@ -1941,7 +1941,7 @@ with cte3 as
19411941
select * from cte1 as s1, cte1 as s2 where s1.c1=s2.c1)
19421942
select r1.c1,r2.c1 from cte2 as r1, cte2 as r2)
19431943
select * from t2;
1944-
ERROR 42S22: Unknown column 'r1.c1' in 'field list'
1944+
ERROR 42S22: Unknown column 'r1.c1' in 'SELECT'
19451945
create procedure p1()
19461946
begin
19471947
insert into t2
@@ -1962,7 +1962,7 @@ with cte1 as (select a from t1)
19621962
select * from t1 as s, t1 as t where s.c1=t.c1 and s.c1 <= 2 and t.c1 >= 2;
19631963
end |
19641964
call p1();
1965-
ERROR 42S22: Unknown column 'a' in 'field list'
1965+
ERROR 42S22: Unknown column 'a' in 'SELECT'
19661966
drop procedure p1;
19671967
drop table t1,t2;
19681968
#

‎mysql-test/main/cte_recursive.result

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4543,33 +4543,33 @@ insert into t1 values (3), (7), (1);
45434543
with recursive
45444544
r as (select * from t1 union select s1.* from t1 as s1, r where s1.a = r.b)
45454545
select * from t1 as t;
4546-
ERROR 42S22: Unknown column 'r.b' in 'where clause'
4546+
ERROR 42S22: Unknown column 'r.b' in 'WHERE'
45474547
explain with recursive
45484548
r as (select * from t1 union select s1.* from t1 as s1, r where s1.a = r.b)
45494549
select * from t1 as t;
4550-
ERROR 42S22: Unknown column 'r.b' in 'where clause'
4550+
ERROR 42S22: Unknown column 'r.b' in 'WHERE'
45514551
create procedure sp1() with recursive
45524552
r as (select * from t1 union select s1.* from t1 as s1, r where s1.a = r.b)
45534553
select * from t1 as t;
45544554
call sp1();
4555-
ERROR 42S22: Unknown column 'r.b' in 'where clause'
4555+
ERROR 42S22: Unknown column 'r.b' in 'WHERE'
45564556
call sp1();
4557-
ERROR 42S22: Unknown column 'r.b' in 'where clause'
4557+
ERROR 42S22: Unknown column 'r.b' in 'WHERE'
45584558
with recursive
45594559
r as (select * from t1 union select s1.* from t1 as s1, r where s1.b = r.a)
45604560
select * from t1 as t;
4561-
ERROR 42S22: Unknown column 's1.b' in 'where clause'
4561+
ERROR 42S22: Unknown column 's1.b' in 'WHERE'
45624562
explain with recursive
45634563
r as (select * from t1 union select s1.* from t1 as s1, r where s1.b = r.a)
45644564
select * from t1 as t;
4565-
ERROR 42S22: Unknown column 's1.b' in 'where clause'
4565+
ERROR 42S22: Unknown column 's1.b' in 'WHERE'
45664566
create procedure sp2() with recursive
45674567
r as (select * from t1 union select s1.* from t1 as s1, r where s1.b = r.a)
45684568
select * from t1 as t;
45694569
call sp2();
4570-
ERROR 42S22: Unknown column 's1.b' in 'where clause'
4570+
ERROR 42S22: Unknown column 's1.b' in 'WHERE'
45714571
call sp2();
4572-
ERROR 42S22: Unknown column 's1.b' in 'where clause'
4572+
ERROR 42S22: Unknown column 's1.b' in 'WHERE'
45734573
drop procedure sp1;
45744574
drop procedure sp2;
45754575
drop table t1;

‎mysql-test/main/delayed.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ CREATE TABLE t1 (a INT);
253253
INSERT DELAYED INTO t1 SET a= b();
254254
ERROR 42000: FUNCTION test.b does not exist
255255
INSERT DELAYED INTO t1 SET b= 1;
256-
ERROR 42S22: Unknown column 'b' in 'field list'
256+
ERROR 42S22: Unknown column 'b' in 'INSERT INTO'
257257
INSERT DELAYED INTO t1 SET b= b();
258258
ERROR 42000: FUNCTION test.b does not exist
259259
DROP TABLE t1;

‎mysql-test/main/delete.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ CREATE TABLE `t1` (
5353
PRIMARY KEY (`i`)
5454
);
5555
DELETE FROM t1 USING t1 WHERE post='1';
56-
ERROR 42S22: Unknown column 'post' in 'where clause'
56+
ERROR 42S22: Unknown column 'post' in 'WHERE'
5757
drop table t1;
5858
CREATE TABLE t1 (
5959
bool char(0) default NULL,
@@ -229,11 +229,11 @@ drop table t1;
229229
CREATE TABLE t1 (a INT);
230230
INSERT INTO t1 VALUES (1);
231231
DELETE FROM t1 ORDER BY x;
232-
ERROR 42S22: Unknown column 'x' in 'order clause'
232+
ERROR 42S22: Unknown column 'x' in 'ORDER BY'
233233
DELETE FROM t1 ORDER BY t2.x;
234-
ERROR 42S22: Unknown column 't2.x' in 'order clause'
234+
ERROR 42S22: Unknown column 't2.x' in 'ORDER BY'
235235
DELETE FROM t1 ORDER BY (SELECT x);
236-
ERROR 42S22: Unknown column 'x' in 'field list'
236+
ERROR 42S22: Unknown column 'x' in 'SELECT'
237237
DROP TABLE t1;
238238
CREATE TABLE t1 (
239239
a INT

‎mysql-test/main/delete_returning.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ a b
4242
5 EEEEE
4343
7 GGGGGGG
4444
DELETE FROM t1 WHERE a=2 RETURNING c;
45-
ERROR 42S22: Unknown column 'c' in 'field list'
45+
ERROR 42S22: Unknown column 'c' in 'RETURNING'
4646
INSERT INTO t1 VALUES (2,'BB'), (2,'bb');
4747
DELETE FROM t1 WHERE a=2 RETURNING a, UPPER(b);
4848
a UPPER(b)

‎mysql-test/main/derived.result

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ select * from (select 2 from DUAL) b;
55
2
66
2
77
SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
8-
ERROR 42S22: Unknown column 'a' in 'field list'
8+
ERROR 42S22: Unknown column 'a' in 'SELECT'
99
SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
10-
ERROR 42S22: Unknown column 'a' in 'field list'
10+
ERROR 42S22: Unknown column 'a' in 'SELECT'
1111
CREATE TABLE t1 (a int not null, b char (10) not null);
1212
insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c');
1313
CREATE TABLE t2 (a int not null, b char (10) not null);
@@ -27,18 +27,18 @@ a y
2727
3 3
2828
3 3
2929
SELECT a FROM (SELECT 1 FROM (SELECT 1) a HAVING a=1) b;
30-
ERROR 42S22: Unknown column 'a' in 'having clause'
30+
ERROR 42S22: Unknown column 'a' in 'HAVING'
3131
SELECT a,b as a FROM (SELECT '1' as a,'2' as b) b HAVING a=1;
32-
ERROR 23000: Column 'a' in having clause is ambiguous
32+
ERROR 23000: Column 'a' in HAVING is ambiguous
3333
SELECT a,2 as a FROM (SELECT '1' as a) b HAVING a=2;
3434
a a
3535
1 2
3636
SELECT a,2 as a FROM (SELECT '1' as a) b HAVING a=1;
3737
a a
3838
SELECT 1 FROM (SELECT 1) a WHERE a=2;
39-
ERROR 42S22: Unknown column 'a' in 'where clause'
39+
ERROR 42S22: Unknown column 'a' in 'WHERE'
4040
SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1 HAVING a=1) as a;
41-
ERROR 42S22: Unknown column 'a' in 'having clause'
41+
ERROR 42S22: Unknown column 'a' in 'HAVING'
4242
select * from t1 as x1, (select * from t1) as x2;
4343
a b a b
4444
1 a 1 a
@@ -154,13 +154,13 @@ select * from (select 1 as a) b left join (select 2 as a) c using(a);
154154
a
155155
1
156156
SELECT * FROM (SELECT 1 UNION SELECT a) b;
157-
ERROR 42S22: Unknown column 'a' in 'field list'
157+
ERROR 42S22: Unknown column 'a' in 'SELECT'
158158
SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
159-
ERROR 42S22: Unknown column 'a' in 'field list'
159+
ERROR 42S22: Unknown column 'a' in 'SELECT'
160160
SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
161-
ERROR 42S22: Unknown column 'a' in 'field list'
161+
ERROR 42S22: Unknown column 'a' in 'SELECT'
162162
select 1 from (select 2) a order by 0;
163-
ERROR 42S22: Unknown column '0' in 'order clause'
163+
ERROR 42S22: Unknown column '0' in 'ORDER BY'
164164
create table t1 (id int);
165165
insert into t1 values (1),(2),(3);
166166
describe select * from (select * from t1 group by id) bar;
@@ -276,15 +276,15 @@ N M
276276
UPDATE `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N SET P1.M = 2, P2.N = 2;
277277
ERROR HY000: The target table P2 of the UPDATE is not updatable
278278
UPDATE `t1` AS P1 INNER JOIN (SELECT aaaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N SET P1.M = 2;
279-
ERROR 42S22: Unknown column 'aaaa' in 'field list'
279+
ERROR 42S22: Unknown column 'aaaa' in 'SELECT'
280280
delete P1.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
281281
select * from t1;
282282
N M
283283
3 0
284284
delete P1.*,p2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS p2 ON P1.N = p2.N;
285285
ERROR HY000: The target table p2 of the DELETE is not updatable
286286
delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
287-
ERROR 42S22: Unknown column 'aaa' in 'field list'
287+
ERROR 42S22: Unknown column 'aaa' in 'SELECT'
288288
drop table t1;
289289
CREATE TABLE t1 (
290290
OBJECTID int(11) NOT NULL default '0',
@@ -467,7 +467,7 @@ t1.id=t3.val
467467
set
468468
t1.val=t3.val
469469
;
470-
ERROR 42S22: Unknown column 'v.val' in 'field list'
470+
ERROR 42S22: Unknown column 'v.val' in 'SELECT'
471471
drop table t1, t2;
472472
#
473473
# MDEV-5353: server crash on subselect if WHERE applied to some
@@ -1336,7 +1336,7 @@ DROP TABLE t1;
13361336
SELECT 1 FROM (
13371337
SELECT 1 UNION SELECT 2 ORDER BY (SELECT 1 FROM DUAL WHERE xxx = 0)
13381338
) dt;
1339-
ERROR 42S22: Unknown column 'xxx' in 'where clause'
1339+
ERROR 42S22: Unknown column 'xxx' in 'WHERE'
13401340
create table t1 (a int, b int);
13411341
insert into t1 values (3,8), (7,2), (1,4), (5,9);
13421342
create table t2 (a int, b int);
@@ -1350,7 +1350,7 @@ union
13501350
select a,b from t2 where t2.b < 6
13511351
order by (a - b / (select a + max(c) from t3 where d = x))
13521352
) dt;
1353-
ERROR 42S22: Unknown column 'x' in 'where clause'
1353+
ERROR 42S22: Unknown column 'x' in 'WHERE'
13541354
drop table t1,t2,t3;
13551355
#
13561356
# End of 10.3 tests

‎mysql-test/main/dyncol.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ ex
16211621
# as a dynamic column name
16221622
#
16231623
select COLUMN_CREATE(color, "black");
1624-
ERROR 42S22: Unknown column 'color' in 'field list'
1624+
ERROR 42S22: Unknown column 'color' in 'SELECT'
16251625
#
16261626
# MDEV-489 Assertion `offset < 0x1f' failed in
16271627
# type_and_offset_store on COLUMN_ADD

‎mysql-test/main/errors.result

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ update t1 set a=1;
77
ERROR 42S02: Table 'test.t1' doesn't exist
88
create table t1 (a int);
99
select count(test.t1.b) from t1;
10-
ERROR 42S22: Unknown column 'test.t1.b' in 'field list'
10+
ERROR 42S22: Unknown column 'test.t1.b' in 'SELECT'
1111
select count(not_existing_database.t1) from t1;
12-
ERROR 42S22: Unknown column 'not_existing_database.t1' in 'field list'
12+
ERROR 42S22: Unknown column 'not_existing_database.t1' in 'SELECT'
1313
select count(not_existing_database.t1.a) from t1;
14-
ERROR 42S22: Unknown column 'not_existing_database.t1.a' in 'field list'
14+
ERROR 42S22: Unknown column 'not_existing_database.t1.a' in 'SELECT'
1515
select count(not_existing_database.t1.a) from not_existing_database.t1;
1616
Got one of the listed errors
1717
select 1 from t1 order by 2;
18-
ERROR 42S22: Unknown column '2' in 'order clause'
18+
ERROR 42S22: Unknown column '2' in 'ORDER BY'
1919
select 1 from t1 group by 2;
20-
ERROR 42S22: Unknown column '2' in 'group statement'
20+
ERROR 42S22: Unknown column '2' in 'GROUP BY'
2121
select 1 from t1 order by t1.b;
22-
ERROR 42S22: Unknown column 't1.b' in 'order clause'
22+
ERROR 42S22: Unknown column 't1.b' in 'ORDER BY'
2323
select count(*),b from t1;
24-
ERROR 42S22: Unknown column 'b' in 'field list'
24+
ERROR 42S22: Unknown column 'b' in 'SELECT'
2525
drop table t1;
2626
create table t1 (a int(256));
2727
ERROR 42000: Display width out of range for 'a' (max = 255)
@@ -45,17 +45,17 @@ Warning 1365 Division by 0
4545
DROP TABLE t1;
4646
CREATE TABLE t1( a INT );
4747
SELECT b FROM t1;
48-
ERROR 42S22: Unknown column 'b' in 'field list'
48+
ERROR 42S22: Unknown column 'b' in 'SELECT'
4949
SHOW ERRORS;
5050
Level Code Message
51-
Error 1054 Unknown column 'b' in 'field list'
51+
Error 1054 Unknown column 'b' in 'SELECT'
5252
CREATE TABLE t2 SELECT b FROM t1;
53-
ERROR 42S22: Unknown column 'b' in 'field list'
53+
ERROR 42S22: Unknown column 'b' in 'SELECT'
5454
SHOW ERRORS;
5555
Level Code Message
56-
Error 1054 Unknown column 'b' in 'field list'
56+
Error 1054 Unknown column 'b' in 'SELECT'
5757
INSERT INTO t1 SELECT b FROM t1;
58-
ERROR 42S22: Unknown column 'b' in 'field list'
58+
ERROR 42S22: Unknown column 'b' in 'SELECT'
5959
DROP TABLE t1;
6060
flush status;
6161
drop table if exists t1, t2;

‎mysql-test/main/explain.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
205205
EXPLAIN SELECT DISTINCT 1 FROM t1,
206206
(SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) as d1
207207
WHERE t1.a = d1.a;
208-
ERROR 42S22: Unknown column 'd1.a' in 'where clause'
208+
ERROR 42S22: Unknown column 'd1.a' in 'WHERE'
209209
DROP TABLE t1;
210210
#
211211
# Bug#48295:

‎mysql-test/main/fulltext_order_by.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ group by
126126
a.text, b.id, b.betreff
127127
order by
128128
match(b.betreff) against ('+abc' in boolean mode) desc;
129-
ERROR 42000: Table 'b' from one of the SELECTs cannot be used in order clause
129+
ERROR 42000: Table 'b' from one of the SELECTs cannot be used in ORDER BY
130130
select a.text, b.id, b.betreff
131131
from
132132
t2 a inner join t3 b on a.id = b.forum inner join
@@ -142,7 +142,7 @@ where
142142
match(c.beitrag) against ('+abc' in boolean mode)
143143
order by
144144
match(b.betreff) against ('+abc' in boolean mode) desc;
145-
ERROR 42000: Table 'b' from one of the SELECTs cannot be used in order clause
145+
ERROR 42000: Table 'b' from one of the SELECTs cannot be used in ORDER BY
146146
select a.text, b.id, b.betreff
147147
from
148148
t2 a inner join t3 b on a.id = b.forum inner join

0 commit comments

Comments
 (0)