Skip to content

Commit f2d0130

Browse files
author
Martin Hansson
committed
WL#7589: Simplification of install scripts.
This patch does two things: - Changes the enabled column's data type to ENUM('YES', 'NO') - Removes the script install_rewriter_with_optional_columns.sql and instead always creates all columns in the normal script. Only the plugin, its MTR files and install scripts are touched.
1 parent bb966f0 commit f2d0130

23 files changed

+223
-277
lines changed

‎mysql-test/suite/query_rewrite_plugins/include/install_rewriter.inc

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ CREATE TABLE IF NOT EXISTS query_rewrite.rewrite_rules (
77
pattern VARCHAR(10000) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
88
pattern_database VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_bin,
99
replacement VARCHAR(10000) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
10-
enabled CHAR(1) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT 'Y',
10+
enabled ENUM('YES', 'NO') CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
11+
DEFAULT 'YES',
1112
message VARCHAR(1000) CHARACTER SET utf8 COLLATE utf8_bin
1213
) DEFAULT CHARSET = utf8 ENGINE = INNODB;
1314

‎mysql-test/suite/query_rewrite_plugins/include/install_rewriter_with_optional_columns.inc

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ CREATE TABLE IF NOT EXISTS query_rewrite.rewrite_rules (
77
pattern VARCHAR(10000) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
88
pattern_database VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_bin,
99
replacement VARCHAR(10000) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
10-
enabled CHAR(1) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT 'Y',
10+
enabled ENUM('YES', 'NO') CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
11+
DEFAULT 'YES',
1112
message VARCHAR(1000) CHARACTER SET utf8 COLLATE utf8_bin,
1213
pattern_digest VARCHAR(32),
1314
normalized_pattern VARCHAR(100)

‎mysql-test/suite/query_rewrite_plugins/r/basic.result

+18-18
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ INSERT INTO query_rewrite.rewrite_rules ( pattern, replacement )
1717
VALUES ( 'SELECT ?', 'SELECT "literal"' );
1818
SELECT * FROM query_rewrite.rewrite_rules;
1919
id pattern pattern_database replacement enabled message
20-
1 SELECT ? NULL SELECT "literal" Y NULL
20+
1 SELECT ? NULL SELECT "literal" YES NULL
2121
CALL query_rewrite.flush_rewrite_rules();
2222
SELECT * FROM query_rewrite.rewrite_rules;
2323
id pattern pattern_database replacement enabled message
24-
1 SELECT ? NULL SELECT "literal" Y NULL
24+
1 SELECT ? NULL SELECT "literal" YES NULL
2525
SELECT NULL;
2626
literal
2727
literal
@@ -68,19 +68,19 @@ VALUES ( 'SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ?',
6868
'SELECT * FROM test.t1 WHERE b = ? OR a = ?' );
6969
SELECT * FROM query_rewrite.rewrite_rules;
7070
id pattern pattern_database replacement enabled message
71-
2 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? Y NULL
72-
3 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' Y NULL
73-
4 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? Y NULL
74-
5 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a Y NULL
75-
6 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? Y NULL
71+
2 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? YES NULL
72+
3 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' YES NULL
73+
4 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? YES NULL
74+
5 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a YES NULL
75+
6 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? YES NULL
7676
CALL query_rewrite.flush_rewrite_rules();
7777
SELECT * FROM query_rewrite.rewrite_rules;
7878
id pattern pattern_database replacement enabled message
79-
2 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? Y NULL
80-
3 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' Y NULL
81-
4 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? Y NULL
82-
5 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a Y NULL
83-
6 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? Y NULL
79+
2 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? YES NULL
80+
3 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' YES NULL
81+
4 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? YES NULL
82+
5 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a YES NULL
83+
6 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? YES NULL
8484
# Check a query that doesn't have a rewrite rule doesn't get rewritten.
8585
SELECT b FROM test.t1;
8686
b
@@ -175,15 +175,15 @@ VALUES ( 'SELECT 1, ?', 'SELECT "rewritten w/rule 1"' ),
175175
( 'SELECT "The_original_query"', 'SELECT "The_rewritten_query"');
176176
SELECT * FROM query_rewrite.rewrite_rules;
177177
id pattern pattern_database replacement enabled message
178-
7 SELECT 1, ? NULL SELECT "rewritten w/rule 1" Y NULL
179-
8 SELECT 2, ? NULL SELECT "rewritten w/rule 2" Y NULL
180-
9 SELECT "The_original_query" NULL SELECT "The_rewritten_query" Y NULL
178+
7 SELECT 1, ? NULL SELECT "rewritten w/rule 1" YES NULL
179+
8 SELECT 2, ? NULL SELECT "rewritten w/rule 2" YES NULL
180+
9 SELECT "The_original_query" NULL SELECT "The_rewritten_query" YES NULL
181181
CALL query_rewrite.flush_rewrite_rules();
182182
SELECT * FROM query_rewrite.rewrite_rules;
183183
id pattern pattern_database replacement enabled message
184-
7 SELECT 1, ? NULL SELECT "rewritten w/rule 1" Y NULL
185-
8 SELECT 2, ? NULL SELECT "rewritten w/rule 2" Y NULL
186-
9 SELECT "The_original_query" NULL SELECT "The_rewritten_query" Y NULL
184+
7 SELECT 1, ? NULL SELECT "rewritten w/rule 1" YES NULL
185+
8 SELECT 2, ? NULL SELECT "rewritten w/rule 2" YES NULL
186+
9 SELECT "The_original_query" NULL SELECT "The_rewritten_query" YES NULL
187187
SELECT 1, 1;
188188
rewritten w/rule 1
189189
rewritten w/rule 1

‎mysql-test/suite/query_rewrite_plugins/r/disabled_rule.result

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Test of disabled rules ('N' in enabled column.)
2+
# Test of disabled rules ('NO' in enabled column.)
33
#
44
CREATE TABLE t1 ( c1 VARCHAR(10), c2 VARCHAR(10) );
55
INSERT INTO t1 VALUES ( 'abc', 'def' ), ( 'ghi', 'klm' ), ( 'nop', 'qrs' );
@@ -8,8 +8,9 @@ INSERT INTO t2 VALUES ( 'abc' ), ( 'klm' );
88
# Query rewrite plugin was installed.
99
INSERT INTO query_rewrite.rewrite_rules ( pattern, replacement, enabled )
1010
VALUES ( 'SELECT * FROM test.t2',
11-
'SELECT * FROM test.t1 JOIN test.t2 ON test.t1.c1 = test.t2.c1', 'N'
11+
'SELECT * FROM test.t1 JOIN test.t2 ON test.t1.c1 = test.t2.c1', 'NO'
1212
);
13+
CALL query_rewrite.flush_rewrite_rules();
1314
# Check that the rewrite rule is not executed.
1415
SELECT * FROM test.t2;
1516
c1
@@ -18,10 +19,10 @@ klm
1819
# Check that the rule is indeed disabled.
1920
SELECT pattern, replacement, enabled FROM query_rewrite.rewrite_rules;
2021
pattern replacement enabled
21-
SELECT * FROM test.t2 SELECT * FROM test.t1 JOIN test.t2 ON test.t1.c1 = test.t2.c1 N
22+
SELECT * FROM test.t2 SELECT * FROM test.t1 JOIN test.t2 ON test.t1.c1 = test.t2.c1 NO
2223
# Enable the previously disabled rule.
2324
UPDATE query_rewrite.rewrite_rules
24-
SET enabled = 'Y'
25+
SET enabled = 'YES'
2526
WHERE pattern = 'SELECT * FROM test.t2';
2627
CALL query_rewrite.flush_rewrite_rules();
2728
# Verify that the rewrite rule is enabled.
@@ -32,7 +33,7 @@ Warnings:
3233
Note 1105 Query 'SELECT * FROM test.t2' rewritten to 'SELECT * FROM test.t1 JOIN test.t2 ON test.t1.c1 = test.t2.c1' by plugin: Rewriter.
3334
# Disable via UPDATE...
3435
UPDATE query_rewrite.rewrite_rules
35-
SET enabled = 'N'
36+
SET enabled = 'NO'
3637
WHERE pattern = 'SELECT * FROM test.t2';
3738
CALL query_rewrite.flush_rewrite_rules();
3839
# Verify that the rewrite rule is disabled again.

‎mysql-test/suite/query_rewrite_plugins/r/engines.result

+36-36
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ INSERT INTO query_rewrite.rewrite_rules ( pattern, replacement )
1717
VALUES ( 'SELECT ?', 'SELECT "literal"' );
1818
SELECT * FROM query_rewrite.rewrite_rules;
1919
id pattern pattern_database replacement enabled message normalized_pattern
20-
1 SELECT ? NULL SELECT "literal" Y NULL NULL
20+
1 SELECT ? NULL SELECT "literal" YES NULL NULL
2121
CALL query_rewrite.flush_rewrite_rules();
2222
SELECT * FROM query_rewrite.rewrite_rules;
2323
id pattern pattern_database replacement enabled message normalized_pattern
24-
1 SELECT ? NULL SELECT "literal" Y NULL select ?
24+
1 SELECT ? NULL SELECT "literal" YES NULL select ?
2525
SELECT NULL;
2626
literal
2727
literal
@@ -68,19 +68,19 @@ VALUES ( 'SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ?',
6868
'SELECT * FROM test.t1 WHERE b = ? OR a = ?' );
6969
SELECT * FROM query_rewrite.rewrite_rules;
7070
id pattern pattern_database replacement enabled message normalized_pattern
71-
2 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? Y NULL NULL
72-
3 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' Y NULL NULL
73-
4 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? Y NULL NULL
74-
5 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a Y NULL NULL
75-
6 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? Y NULL NULL
71+
2 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? YES NULL NULL
72+
3 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' YES NULL NULL
73+
4 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? YES NULL NULL
74+
5 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a YES NULL NULL
75+
6 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? YES NULL NULL
7676
CALL query_rewrite.flush_rewrite_rules();
7777
SELECT * FROM query_rewrite.rewrite_rules;
7878
id pattern pattern_database replacement enabled message normalized_pattern
79-
2 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? Y NULL select `*` from `test`.`t1` where (((`a` = ?) and ?) or (`b` = ?))
80-
3 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' Y NULL select `a` from `test`.`t1`
81-
4 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? Y NULL select `a` from `test`.`t1` where (`b` = ?)
82-
5 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a Y NULL select `*` from `test`.`t2`
83-
6 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? Y NULL select `*` from `test`.`t1` where ((`a` = ?) or (`b` = ?))
79+
2 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? YES NULL select `*` from `test`.`t1` where (((`a` = ?) and ?) or (`b` = ?))
80+
3 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' YES NULL select `a` from `test`.`t1`
81+
4 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? YES NULL select `a` from `test`.`t1` where (`b` = ?)
82+
5 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a YES NULL select `*` from `test`.`t2`
83+
6 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? YES NULL select `*` from `test`.`t1` where ((`a` = ?) or (`b` = ?))
8484
# Check a query that doesn't have a rewrite rule doesn't get rewritten.
8585
SELECT b FROM test.t1;
8686
b
@@ -175,15 +175,15 @@ VALUES ( 'SELECT 1, ?', 'SELECT "rewritten w/rule 1"' ),
175175
( 'SELECT "The_original_query"', 'SELECT "The_rewritten_query"');
176176
SELECT * FROM query_rewrite.rewrite_rules;
177177
id pattern pattern_database replacement enabled message normalized_pattern
178-
7 SELECT 1, ? NULL SELECT "rewritten w/rule 1" Y NULL NULL
179-
8 SELECT 2, ? NULL SELECT "rewritten w/rule 2" Y NULL NULL
180-
9 SELECT "The_original_query" NULL SELECT "The_rewritten_query" Y NULL NULL
178+
7 SELECT 1, ? NULL SELECT "rewritten w/rule 1" YES NULL NULL
179+
8 SELECT 2, ? NULL SELECT "rewritten w/rule 2" YES NULL NULL
180+
9 SELECT "The_original_query" NULL SELECT "The_rewritten_query" YES NULL NULL
181181
CALL query_rewrite.flush_rewrite_rules();
182182
SELECT * FROM query_rewrite.rewrite_rules;
183183
id pattern pattern_database replacement enabled message normalized_pattern
184-
7 SELECT 1, ? NULL SELECT "rewritten w/rule 1" Y NULL select ?,?
185-
8 SELECT 2, ? NULL SELECT "rewritten w/rule 2" Y NULL select ?,?
186-
9 SELECT "The_original_query" NULL SELECT "The_rewritten_query" Y NULL select ?
184+
7 SELECT 1, ? NULL SELECT "rewritten w/rule 1" YES NULL select ?,?
185+
8 SELECT 2, ? NULL SELECT "rewritten w/rule 2" YES NULL select ?,?
186+
9 SELECT "The_original_query" NULL SELECT "The_rewritten_query" YES NULL select ?
187187
SELECT 1, 1;
188188
rewritten w/rule 1
189189
rewritten w/rule 1
@@ -229,11 +229,11 @@ INSERT INTO query_rewrite.rewrite_rules ( pattern, replacement )
229229
VALUES ( 'SELECT ?', 'SELECT "literal"' );
230230
SELECT * FROM query_rewrite.rewrite_rules;
231231
id pattern pattern_database replacement enabled message normalized_pattern
232-
10 SELECT ? NULL SELECT "literal" Y NULL NULL
232+
10 SELECT ? NULL SELECT "literal" YES NULL NULL
233233
CALL query_rewrite.flush_rewrite_rules();
234234
SELECT * FROM query_rewrite.rewrite_rules;
235235
id pattern pattern_database replacement enabled message normalized_pattern
236-
10 SELECT ? NULL SELECT "literal" Y NULL select ?
236+
10 SELECT ? NULL SELECT "literal" YES NULL select ?
237237
SELECT NULL;
238238
literal
239239
literal
@@ -280,19 +280,19 @@ VALUES ( 'SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ?',
280280
'SELECT * FROM test.t1 WHERE b = ? OR a = ?' );
281281
SELECT * FROM query_rewrite.rewrite_rules;
282282
id pattern pattern_database replacement enabled message normalized_pattern
283-
11 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? Y NULL NULL
284-
12 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' Y NULL NULL
285-
13 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? Y NULL NULL
286-
14 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a Y NULL NULL
287-
15 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? Y NULL NULL
283+
11 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? YES NULL NULL
284+
12 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' YES NULL NULL
285+
13 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? YES NULL NULL
286+
14 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a YES NULL NULL
287+
15 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? YES NULL NULL
288288
CALL query_rewrite.flush_rewrite_rules();
289289
SELECT * FROM query_rewrite.rewrite_rules;
290290
id pattern pattern_database replacement enabled message normalized_pattern
291-
11 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? Y NULL select `*` from `test`.`t1` where (((`a` = ?) and ?) or (`b` = ?))
292-
12 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' Y NULL select `a` from `test`.`t1`
293-
13 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? Y NULL select `a` from `test`.`t1` where (`b` = ?)
294-
14 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a Y NULL select `*` from `test`.`t2`
295-
15 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? Y NULL select `*` from `test`.`t1` where ((`a` = ?) or (`b` = ?))
291+
11 SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ? NULL SELECT a FROM test.t1 WHERE a = ? YES NULL select `*` from `test`.`t1` where (((`a` = ?) and ?) or (`b` = ?))
292+
12 SELECT a FROM test.t1 NULL SELECT * FROM test.t1 WHERE a = 'abc' YES NULL select `a` from `test`.`t1`
293+
13 SELECT a FROM test.t1 WHERE b = ? NULL SELECT * FROM test.t1 WHERE b = ? YES NULL select `a` from `test`.`t1` where (`b` = ?)
294+
14 SELECT * FROM test.t2 NULL SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a YES NULL select `*` from `test`.`t2`
295+
15 SELECT * FROM test.t1 WHERE a = ? OR b = ? NULL SELECT * FROM test.t1 WHERE b = ? OR a = ? YES NULL select `*` from `test`.`t1` where ((`a` = ?) or (`b` = ?))
296296
# Check a query that doesn't have a rewrite rule doesn't get rewritten.
297297
SELECT b FROM test.t1;
298298
b
@@ -387,15 +387,15 @@ VALUES ( 'SELECT 1, ?', 'SELECT "rewritten w/rule 1"' ),
387387
( 'SELECT "The_original_query"', 'SELECT "The_rewritten_query"');
388388
SELECT * FROM query_rewrite.rewrite_rules;
389389
id pattern pattern_database replacement enabled message normalized_pattern
390-
16 SELECT 1, ? NULL SELECT "rewritten w/rule 1" Y NULL NULL
391-
17 SELECT 2, ? NULL SELECT "rewritten w/rule 2" Y NULL NULL
392-
18 SELECT "The_original_query" NULL SELECT "The_rewritten_query" Y NULL NULL
390+
16 SELECT 1, ? NULL SELECT "rewritten w/rule 1" YES NULL NULL
391+
17 SELECT 2, ? NULL SELECT "rewritten w/rule 2" YES NULL NULL
392+
18 SELECT "The_original_query" NULL SELECT "The_rewritten_query" YES NULL NULL
393393
CALL query_rewrite.flush_rewrite_rules();
394394
SELECT * FROM query_rewrite.rewrite_rules;
395395
id pattern pattern_database replacement enabled message normalized_pattern
396-
16 SELECT 1, ? NULL SELECT "rewritten w/rule 1" Y NULL select ?,?
397-
17 SELECT 2, ? NULL SELECT "rewritten w/rule 2" Y NULL select ?,?
398-
18 SELECT "The_original_query" NULL SELECT "The_rewritten_query" Y NULL select ?
396+
16 SELECT 1, ? NULL SELECT "rewritten w/rule 1" YES NULL select ?,?
397+
17 SELECT 2, ? NULL SELECT "rewritten w/rule 2" YES NULL select ?,?
398+
18 SELECT "The_original_query" NULL SELECT "The_rewritten_query" YES NULL select ?
399399
SELECT 1, 1;
400400
rewritten w/rule 1
401401
rewritten w/rule 1

0 commit comments

Comments
 (0)