diff options
| -rw-r--r-- | mysql-test/main/opt_trace,ps.rdiff | 92 | ||||
| -rw-r--r-- | mysql-test/main/opt_trace.test | 7 |
2 files changed, 95 insertions, 4 deletions
diff --git a/mysql-test/main/opt_trace,ps.rdiff b/mysql-test/main/opt_trace,ps.rdiff new file mode 100644 index 00000000000..f79d3f3d9ea --- /dev/null +++ b/mysql-test/main/opt_trace,ps.rdiff @@ -0,0 +1,92 @@ +--- opt_trace.result ++++ opt_trace,ps.result +@@ -2829,14 +2829,6 @@ + } + }, + { +- "transformation": { +- "select_id": 2, +- "from": "IN (SELECT)", +- "to": "semijoin", +- "chosen": true +- } +- }, +- { + "expanded_query": "/* select#2 */ select t10.pk from t10" + } + ] +@@ -4402,14 +4394,6 @@ + } + }, + { +- "transformation": { +- "select_id": 2, +- "from": "IN (SELECT)", +- "to": "semijoin", +- "chosen": true +- } +- }, +- { + "expanded_query": "/* select#2 */ select t_inner_1.a from t1 t_inner_1 join t1 t_inner_2" + } + ] +@@ -4852,14 +4836,6 @@ + } + }, + { +- "transformation": { +- "select_id": 2, +- "from": "IN (SELECT)", +- "to": "semijoin", +- "chosen": true +- } +- }, +- { + "expanded_query": "/* select#2 */ select t_inner_1.a from t2 t_inner_2 join t1 t_inner_1" + } + ] +@@ -4879,14 +4855,6 @@ + } + }, + { +- "transformation": { +- "select_id": 3, +- "from": "IN (SELECT)", +- "to": "semijoin", +- "chosen": true +- } +- }, +- { + "expanded_query": "/* select#3 */ select t_inner_3.a from t2 t_inner_3 join t1 t_inner_4" + } + ] +@@ -6432,14 +6400,6 @@ + } + }, + { +- "transformation": { +- "select_id": 2, +- "from": "IN (SELECT)", +- "to": "semijoin", +- "chosen": true +- } +- }, +- { + "expanded_query": "/* select#2 */ select t_inner_1.a from t2 t_inner_2 join t1 t_inner_1" + } + ] +@@ -6459,14 +6419,6 @@ + } + }, + { +- "transformation": { +- "select_id": 3, +- "from": "IN (SELECT)", +- "to": "semijoin", +- "chosen": true +- } +- }, +- { + "expanded_query": "/* select#3 */ select t_inner_3.a from t2 t_inner_3 join t1 t_inner_4" + } + ] diff --git a/mysql-test/main/opt_trace.test b/mysql-test/main/opt_trace.test index 35a1f99236f..e0c65723012 100644 --- a/mysql-test/main/opt_trace.test +++ b/mysql-test/main/opt_trace.test @@ -1,9 +1,6 @@ -if (`SELECT $PS_PROTOCOL != 0`) -{ - --skip Test temporarily disabled for ps-protocol -} --source include/not_embedded.inc --source include/have_sequence.inc +--source include/protocol.inc SELECT table_name, column_name FROM information_schema.columns where table_name="OPTIMIZER_TRACE"; show variables like 'optimizer_trace'; set optimizer_trace="enabled=on"; @@ -267,12 +264,14 @@ begin return a; end| +--enable_prepare_warnings create function f2(a int) returns int begin declare a int default 0; select count(*) from t2 into a; return a; end| +--disable_prepare_warnings delimiter ;| set optimizer_trace='enabled=on'; |