Skip to content

Commit 47208f3

Browse files
OlernovOlernov
committed
MDEV-33281 Fix after-rebase commits
1 parent 3250686 commit 47208f3

File tree

4 files changed

+113
-113
lines changed

4 files changed

+113
-113
lines changed

‎mysql-test/main/lowercase_table.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ a
230230
1
231231
2
232232
Warnings:
233-
Warning 4210 Hint BKA("A") is ignored as conflicting/duplicated
233+
Warning 4217 Hint BKA("A") is ignored as conflicting/duplicated
234234
DROP TABLE t1;
235235
#
236236
# End of 11.7 tests

‎mysql-test/main/opt_hint_timeout.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ SELECT /*+ MAX_EXECUTION_TIME(10) MAX_EXECUTION_TIME(100) */ count(*) FROM t1;
4949
count(*)
5050
512
5151
Warnings:
52-
Warning 4210 Hint MAX_EXECUTION_TIME(100) is ignored as conflicting/duplicated
52+
Warning 4217 Hint MAX_EXECUTION_TIME(100) is ignored as conflicting/duplicated
5353
# Wrong values
5454
SELECT /*+ MAX_EXECUTION_TIME(0) */ count(*) FROM t1;
5555
count(*)
@@ -102,7 +102,7 @@ SELECT /*+ MAX_EXECUTION_TIME(30) */ count(*) FROM t1;
102102
count(*)
103103
512
104104
Warnings:
105-
Warning 4210 Hint MAX_EXECUTION_TIME(30) is ignored as conflicting/duplicated
105+
Warning 4217 Hint MAX_EXECUTION_TIME(30) is ignored as conflicting/duplicated
106106
SELECT count(*) FROM t1
107107
UNION
108108
SELECT /*+ MAX_EXECUTION_TIME(30) */ count(*) FROM t1;

‎mysql-test/main/opt_hints.result

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ a
1515
1
1616
2
1717
Warnings:
18-
Warning 4213 Unresolved index name `t1`@`select#1` `idx_å` for NO_MRR hint
18+
Warning 4220 Unresolved index name `t1`@`select#1` `idx_å` for NO_MRR hint
1919
SELECT /*+ NO_MRR(t1 idx_a, idx_å, idx_A) */ a FROM t1;
2020
a
2121
1
2222
2
2323
Warnings:
24-
Warning 4210 Hint NO_MRR(`t1` `idx_A`) is ignored as conflicting/duplicated
25-
Warning 4213 Unresolved index name `t1`@`select#1` `idx_å` for NO_MRR hint
24+
Warning 4217 Hint NO_MRR(`t1` `idx_A`) is ignored as conflicting/duplicated
25+
Warning 4220 Unresolved index name `t1`@`select#1` `idx_å` for NO_MRR hint
2626
DROP TABLE t1;
2727
# Testing that query block names are accent sensitive case insensitive
2828
CREATE TABLE t1 (a INT);
2929
SELECT /*+ QB_NAME(a) BKA(t1@a) BKA(t1@A) */ * FROM t1;
3030
a
3131
Warnings:
32-
Warning 4210 Hint BKA(`t1`@`A`) is ignored as conflicting/duplicated
32+
Warning 4217 Hint BKA(`t1`@`A`) is ignored as conflicting/duplicated
3333
SELECT /*+ QB_NAME(a) BKA(t1@a) BKA(t1@å) */ * FROM t1;
3434
a
3535
Warnings:
36-
Warning 4211 Query block name `å` is not found for BKA hint
36+
Warning 4218 Query block name `å` is not found for BKA hint
3737
DROP TABLE t1;
3838
CREATE TABLE t1(f1 INT, f2 INT);
3939
INSERT INTO t1 VALUES
@@ -230,7 +230,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
230230
1 SIMPLE t4 ref y_idx y_idx 5 const 1 100.00
231231
1 SIMPLE t5 range x_idx x_idx 5 NULL 2 100.00 Using where; Using join buffer (flat, BNL join)
232232
Warnings:
233-
Warning 4213 Unresolved index name `t5`@`select#2` `z_idx` for NO_ICP hint
233+
Warning 4220 Unresolved index name `t5`@`select#2` `z_idx` for NO_ICP hint
234234
Note 1003 select /*+ NO_ICP(`t5`@`select#2` `y_idx`) NO_ICP(`t5`@`select#2` `x_idx`) */ `test`.`t4`.`x` AS `x`,`test`.`t5`.`y` AS `y` from `test`.`t4` join `test`.`t4` `t5` where `test`.`t4`.`y` = 8 and `test`.`t5`.`x` between 7 and <cache>(8 + 0)
235235
# ICP should still be used
236236
EXPLAIN EXTENDED SELECT * FROM
@@ -548,7 +548,7 @@ EXPLAIN EXTENDED SELECT /*+ QB_NAME(qb1) QB_NAME(qb1 ) */ * FROM t2;
548548
id select_type table type possible_keys key key_len ref rows filtered Extra
549549
1 SIMPLE t2 ALL NULL NULL NULL NULL 28 100.00
550550
Warnings:
551-
Warning 4210 Hint QB_NAME(`qb1`) is ignored as conflicting/duplicated
551+
Warning 4217 Hint QB_NAME(`qb1`) is ignored as conflicting/duplicated
552552
Note 1003 select /*+ QB_NAME(`qb1`) */ `test`.`t2`.`f1` AS `f1`,`test`.`t2`.`f2` AS `f2`,`test`.`t2`.`f3` AS `f3` from `test`.`t2`
553553
# Should issue warning
554554
EXPLAIN EXTENDED SELECT /*+ BKA(@qb1) QB_NAME(qb1) */ t2.f1, t2.f2, t2.f3 FROM t1,t2
@@ -557,7 +557,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
557557
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 100.00
558558
1 SIMPLE t2 ALL f1 NULL NULL NULL 28 25.00 Using where; Using join buffer (flat, BNL join)
559559
Warnings:
560-
Warning 4211 Query block name `qb1` is not found for BKA hint
560+
Warning 4218 Query block name `qb1` is not found for BKA hint
561561
Note 1003 select /*+ QB_NAME(`qb1`) */ `test`.`t2`.`f1` AS `f1`,`test`.`t2`.`f2` AS `f2`,`test`.`t2`.`f3` AS `f3` from `test`.`t1` join `test`.`t2` where `test`.`t2`.`f1` = `test`.`t1`.`f1` and `test`.`t2`.`f2` between `test`.`t1`.`f1` and `test`.`t1`.`f2` and `test`.`t2`.`f2` + 1 >= `test`.`t1`.`f1` + 1
562562
# Should not crash
563563
PREPARE stmt1 FROM "SELECT /*+ BKA(t2) */ t2.f1, t2.f2, t2.f3 FROM t1,t2
@@ -601,9 +601,9 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
601601
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 100.00
602602
1 SIMPLE t2 ALL f1 NULL NULL NULL 28 25.00 Using where; Using join buffer (flat, BNL join)
603603
Warnings:
604-
Warning 4212 Unresolved table name `t3`@`select#1` for BKA hint
605-
Warning 4212 Unresolved table name `t3`@`select#1` for NO_RANGE_OPTIMIZATION hint
606-
Warning 4213 Unresolved index name `t3`@`select#1` `idx1` for NO_RANGE_OPTIMIZATION hint
604+
Warning 4219 Unresolved table name `t3`@`select#1` for BKA hint
605+
Warning 4219 Unresolved table name `t3`@`select#1` for NO_RANGE_OPTIMIZATION hint
606+
Warning 4220 Unresolved index name `t3`@`select#1` `idx1` for NO_RANGE_OPTIMIZATION hint
607607
Note 1003 select /*+ BKA(`t2`@`select#1`) NO_BNL(`t1`@`select#1`) */ `test`.`t2`.`f1` AS `f1`,`test`.`t2`.`f2` AS `f2`,`test`.`t2`.`f3` AS `f3` from `test`.`t1` join `test`.`t2` where `test`.`t2`.`f1` = `test`.`t1`.`f1` and `test`.`t2`.`f2` between `test`.`t1`.`f1` and `test`.`t1`.`f2` and `test`.`t2`.`f2` + 1 >= `test`.`t1`.`f1` + 1
608608
# Check illegal syntax
609609
EXPLAIN EXTENDED SELECT /*+ BKA(qb1 t3@qb1) */ f2 FROM
@@ -640,7 +640,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
640640
1 SIMPLE tbl12 ALL NULL NULL NULL NULL 10 100.00 Using where
641641
1 SIMPLE tbl13 hash_ALL a #hash#a 5 test.tbl12.a 1000 0.10 Using where; Using join buffer (flat, BNLH join)
642642
Warnings:
643-
Warning 4212 Unresolved table name `tbl2`@`select#1` for BKA hint
643+
Warning 4219 Unresolved table name `tbl2`@`select#1` for BKA hint
644644
Note 1003 select `test`.`tbl12`.`a` AS `a`,`test`.`tbl12`.`b` AS `b`,`test`.`tbl13`.`a` AS `a`,`test`.`tbl13`.`b` AS `b`,`test`.`tbl13`.`c` AS `c`,`test`.`tbl13`.`filler` AS `filler` from `test`.`t12` `tbl12` join `test`.`t13` `tbl13` where `test`.`tbl13`.`a` = `test`.`tbl12`.`a` and `test`.`tbl13`.`b` + 1 <= `test`.`tbl13`.`b` + 1
645645
# Check that PS and conventional statements give the same result.
646646
FLUSH STATUS;
@@ -1476,19 +1476,19 @@ SELECT /*+ BKA() BKA() */ 1;
14761476
1
14771477
1
14781478
Warnings:
1479-
Warning 4210 Hint BKA() is ignored as conflicting/duplicated
1479+
Warning 4217 Hint BKA() is ignored as conflicting/duplicated
14801480
SELECT /*+ BKA(t1) BKA(t1) */ * FROM t1;
14811481
i
14821482
Warnings:
1483-
Warning 4210 Hint BKA(`t1`) is ignored as conflicting/duplicated
1483+
Warning 4217 Hint BKA(`t1`) is ignored as conflicting/duplicated
14841484
SELECT /*+ QB_NAME(q1) BKA(t1@q1) BKA(t1@q1) */ * FROM t1;
14851485
i
14861486
Warnings:
1487-
Warning 4210 Hint BKA(`t1`@`q1`) is ignored as conflicting/duplicated
1487+
Warning 4217 Hint BKA(`t1`@`q1`) is ignored as conflicting/duplicated
14881488
SELECT /*+ QB_NAME(q1) NO_ICP(@q1 t1 PRIMARY) NO_ICP(@q1 t1 PRIMARY) */ * FROM t1;
14891489
i
14901490
Warnings:
1491-
Warning 4210 Hint NO_ICP(`t1`@`q1` `PRIMARY`) is ignored as conflicting/duplicated
1491+
Warning 4217 Hint NO_ICP(`t1`@`q1` `PRIMARY`) is ignored as conflicting/duplicated
14921492
DROP TABLE t1;
14931493
#
14941494
# Hints inside views are not supported
@@ -1497,7 +1497,7 @@ CREATE TABLE t1 (a INT, INDEX idx_a(a));
14971497
INSERT INTO t1 VALUES (1),(2);
14981498
CREATE VIEW v1 AS SELECT /*+ NO_MRR(t1 idx_a) */ a FROM t1;
14991499
Warnings:
1500-
Warning 4214 Optimizer hints are not supported inside view definitions
1500+
Warning 4221 Optimizer hints are not supported inside view definitions
15011501
SELECT * FROM v1;
15021502
a
15031503
1
@@ -1513,13 +1513,13 @@ Warnings:
15131513
Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1`
15141514
CREATE OR REPLACE VIEW v1 AS SELECT /*+ NO_MRR(t1 idx_a) BKA(t1)*/ a FROM t1;
15151515
Warnings:
1516-
Warning 4214 Optimizer hints are not supported inside view definitions
1516+
Warning 4221 Optimizer hints are not supported inside view definitions
15171517
SHOW CREATE VIEW v1;
15181518
View Create View character_set_client collation_connection
15191519
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1` utf8mb4 utf8mb4_uca1400_ai_ci
15201520
ALTER VIEW v1 AS SELECT /*+ QB_NAME(q1)*/ a FROM t1;
15211521
Warnings:
1522-
Warning 4214 Optimizer hints are not supported inside view definitions
1522+
Warning 4221 Optimizer hints are not supported inside view definitions
15231523
SHOW CREATE VIEW v1;
15241524
View Create View character_set_client collation_connection
15251525
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1` utf8mb4 utf8mb4_uca1400_ai_ci
@@ -1686,15 +1686,15 @@ Warning 1064 Optimizer hint syntax error near 'b) */ 1 FROM t1 a, t1 b' at lin
16861686
SELECT /*+ NO_ICP(i1) */ 1 FROM t1;
16871687
1
16881688
Warnings:
1689-
Warning 4212 Unresolved table name `i1`@`select#1` for NO_ICP hint
1689+
Warning 4219 Unresolved table name `i1`@`select#1` for NO_ICP hint
16901690
SELECT /*+ NO_ICP(i1 i2) */ 1 FROM t1;
16911691
1
16921692
Warnings:
1693-
Warning 4213 Unresolved index name `i1`@`select#1` `i2` for NO_ICP hint
1693+
Warning 4220 Unresolved index name `i1`@`select#1` `i2` for NO_ICP hint
16941694
SELECT /*+ NO_ICP(@qb ident) */ 1 FROM t1;
16951695
1
16961696
Warnings:
1697-
Warning 4211 Query block name `qb` is not found for NO_ICP hint
1697+
Warning 4218 Query block name `qb` is not found for NO_ICP hint
16981698

16991699
# valid hint sequences, no warnings expected:
17001700

@@ -1749,49 +1749,49 @@ CREATE INDEX 3rd_index ON t1(i, j);
17491749
SELECT /*+ NO_ICP(3rd_index) */ 1 FROM t1;
17501750
1
17511751
Warnings:
1752-
Warning 4212 Unresolved table name `3rd_index`@`select#1` for NO_ICP hint
1752+
Warning 4219 Unresolved table name `3rd_index`@`select#1` for NO_ICP hint
17531753
CREATE INDEX $index ON t1(j, i);
17541754
SELECT /*+ NO_ICP($index) */ 1 FROM t1;
17551755
1
17561756
Warnings:
1757-
Warning 4212 Unresolved table name `$index`@`select#1` for NO_ICP hint
1757+
Warning 4219 Unresolved table name `$index`@`select#1` for NO_ICP hint
17581758
CREATE TABLE ` quoted name test` (i INT);
17591759
SELECT /*+ BKA(` quoted name test`) */ 1 FROM t1;
17601760
1
17611761
Warnings:
1762-
Warning 4212 Unresolved table name ` quoted name test`@`select#1` for BKA hint
1762+
Warning 4219 Unresolved table name ` quoted name test`@`select#1` for BKA hint
17631763
SELECT /*+ BKA(` quoted name test`@`select#1`) */ 1 FROM t1;
17641764
1
17651765
Warnings:
1766-
Warning 4211 Query block name `select#1` is not found for BKA hint
1766+
Warning 4218 Query block name `select#1` is not found for BKA hint
17671767
DROP TABLE ` quoted name test`;
17681768
SET SQL_MODE = 'ANSI_QUOTES';
17691769
CREATE TABLE " quoted name test" (i INT);
17701770
SELECT /*+ BKA(" quoted name test") */ 1 FROM t1;
17711771
1
17721772
Warnings:
1773-
Warning 4212 Unresolved table name " quoted name test"@"select#1" for BKA hint
1773+
Warning 4219 Unresolved table name " quoted name test"@"select#1" for BKA hint
17741774
SELECT /*+ BKA(" quoted name test"@"select#1") */ 1 FROM t1;
17751775
1
17761776
Warnings:
1777-
Warning 4211 Query block name "select#1" is not found for BKA hint
1777+
Warning 4218 Query block name "select#1" is not found for BKA hint
17781778
CREATE TABLE `test1``test2``` (i INT);
17791779
SELECT /*+ BKA(`test1``test2```) */ 1;
17801780
1
17811781
1
17821782
Warnings:
1783-
Warning 4212 Unresolved table name "test1`test2`"@"select#1" for BKA hint
1783+
Warning 4219 Unresolved table name "test1`test2`"@"select#1" for BKA hint
17841784
SELECT /*+ BKA("test1""test2""") */ 1;
17851785
1
17861786
1
17871787
Warnings:
1788-
Warning 4212 Unresolved table name "test1""test2"""@"select#1" for BKA hint
1788+
Warning 4219 Unresolved table name "test1""test2"""@"select#1" for BKA hint
17891789
SET SQL_MODE = '';
17901790
# should warn:
17911791
SELECT /*+ BKA(" quoted name test") */ 1 FROM t1;
17921792
1
17931793
Warnings:
1794-
Warning 4212 Unresolved table name ` quoted name test`@`select#1` for BKA hint
1794+
Warning 4219 Unresolved table name ` quoted name test`@`select#1` for BKA hint
17951795
DROP TABLE ` quoted name test`;
17961796
DROP TABLE `test1``test2```;
17971797
# Valid hints, no warning:
@@ -1843,29 +1843,29 @@ CREATE TABLE tableТ (i INT);
18431843
SELECT /*+ BKA(tableТ) */ 1 FROM t1;
18441844
1
18451845
Warnings:
1846-
Warning 4212 Unresolved table name `tableТ`@`select#1` for BKA hint
1846+
Warning 4219 Unresolved table name `tableТ`@`select#1` for BKA hint
18471847
SELECT /*+ BKA(test@tableТ) */ 1 FROM t1;
18481848
1
18491849
Warnings:
1850-
Warning 4211 Query block name `tableТ` is not found for BKA hint
1850+
Warning 4218 Query block name `tableТ` is not found for BKA hint
18511851
DROP TABLE tableТ;
18521852
CREATE TABLE таблица (i INT);
18531853
SELECT /*+ BKA(`таблица`) */ 1 FROM t1;
18541854
1
18551855
Warnings:
1856-
Warning 4212 Unresolved table name `таблица`@`select#1` for BKA hint
1856+
Warning 4219 Unresolved table name `таблица`@`select#1` for BKA hint
18571857
SELECT /*+ BKA(таблица) */ 1 FROM t1;
18581858
1
18591859
Warnings:
1860-
Warning 4212 Unresolved table name `таблица`@`select#1` for BKA hint
1860+
Warning 4219 Unresolved table name `таблица`@`select#1` for BKA hint
18611861
SELECT /*+ BKA(test@таблица) */ 1 FROM t1;
18621862
1
18631863
Warnings:
1864-
Warning 4211 Query block name `таблица` is not found for BKA hint
1864+
Warning 4218 Query block name `таблица` is not found for BKA hint
18651865
SELECT /*+ NO_ICP(`\D1`) */ 1 FROM t1;
18661866
1
18671867
Warnings:
1868-
Warning 4212 Unresolved table name `\D1`@`select#1` for NO_ICP hint
1868+
Warning 4219 Unresolved table name `\D1`@`select#1` for NO_ICP hint
18691869
DROP TABLE таблица;
18701870

18711871
# derived tables and other subqueries:
@@ -1966,7 +1966,7 @@ NO_ICP(@qb ident)
19661966
1
19671967
1
19681968
Warnings:
1969-
Warning 4211 Query block name `qb` is not found for NO_ICP hint
1969+
Warning 4218 Query block name `qb` is not found for NO_ICP hint
19701970
SELECT /*+
19711971
? bad syntax
19721972
*/ 1;

0 commit comments

Comments
 (0)