List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:February 7 2012 4:40pm
Subject:bzr push into mysql-trunk branch (mattias.jonsson:3833 to 3834) WL#4443
View as plain text  
 3834 Mattias Jonsson	2012-02-07
      WL#4443 - Updated test result files + added test collection for this branch.

    added:
      mysql-test/collections/mysql-trunk-wl4443.push
    modified:
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
 3833 Mattias Jonsson	2012-02-07
      WL#4443 - did not compile with gcc, only VC++ due to enum issues.

    modified:
      sql/item.cc
      sql/item.h
      sql/partition_info.h
=== added file 'mysql-test/collections/mysql-trunk-wl4443.push'
--- a/mysql-test/collections/mysql-trunk-wl4443.push	1970-01-01 00:00:00 +0000
+++ b/mysql-test/collections/mysql-trunk-wl4443.push	revid:mattias.jonsson@stripped
@@ -0,0 +1,48 @@
+# Default suites in modes normal, binlog format mixed/row,embedded and ps-protocol
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug  --vardir=var-normal-debug  --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=n_mix-debug  --vardir=var-n_mix-debug  --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=row-debug  --vardir=var-row-debug  --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps_row-debug  --vardir=var-ps_row-debug  --mysqld=--binlog-format=row  --ps-protocol --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded-debug  --vardir=var-embedded-debug  --embedded
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug  --vardir=var-ps-debug  --ps-protocol --skip-test-list=collections/disabled-daily.list
+
+# From default.push
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main,parts --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed  --suite=main,parts --embedded --experimental=collections/default.experimental --skip-ndb
+# Partition specific
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --suite=parts --comment=parts-n_mix-debug  --vardir=var-n_mix-debug  --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --suite=parts --comment=parts-row-debug  --vardir=var-row-debug  --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --suite=parts --comment=parts-ps_row-debug  --vardir=var-ps_row-debug  --mysqld=--binlog-format=row  --ps-protocol --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --suite=parts --comment=parts-embedded-debug  --vardir=var-embedded-debug  --embedded
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --suite=parts --comment=parts-ps-debug  --vardir=var-ps-debug  --ps-protocol --skip-test-list=collections/disabled-daily.list
+
+# Run the suites that are not part of the default - funcs_2, parts, stress, jp, nist
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs2-debug  --vardir=var-funcs2-debug  --suite=funcs_2
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=partitions-debug  --vardir=var-parts-debug --suite=parts
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=stress-debug --vardir=var-stress-debug  --suite=stress
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=jp-debug --vardir=var-jp-debug --suite=jp
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist-debug  --vardir=var-nist-debug --suite=nist
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist+ps-debug --vardir=var-ps_nist-debug  --suite=nist  --ps-protocol
+
+# Additional modes for rpl and binlog suites. Checksum and relay-log-info-repository
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum-debug  --vardir=var-rpl_binlog_checksum-debug --suite=rpl,binlog --mysqld=--binlog-checksum=CRC32 --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay-debug --vardir=var-rpl_crash_safe_relay-debug --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master-debug --vardir=var-rpl_crash_safe_master-debug --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
+
+# Additional modes for rpl. Multi-Threaded Slave
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb  --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_ps_row_MTS --vardir=var-mts-rpl-binlog-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb  --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_stmt_MTS --vardir=var-mts-rpl-binlog-stmt --mysqld=--binlog-format=statement --experimental=collections/default.experimental --skip-ndb  --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
+
+# Additional runs for innodb-page-size=4k and 8k
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
+
+#Engine independent tests
+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-myisam-engine-debug --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-myisam-engine-debug --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto  --comment=eits-rpl-binlog-mixed-tests-myisam-engine-debug --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-myisam-engine-debug --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-innodb-engine-debug --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-innodb-engine-debug --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine-debug --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine-debug --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --timer --force  --debug-server --parallel=auto  --comment=eits-tests-myisam-engine-debug --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-myisam-engine-debug --suite=engines/iuds,engines/funcs --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam  --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-innodb-engine-debug --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine-debug --suite=engines/iuds,engines/funcs  --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-daily.list

=== modified file 'mysql-test/r/innodb_explain_non_select_all.result'
--- a/mysql-test/r/innodb_explain_non_select_all.result	revid:mattias.jonsson@stripped
+++ b/mysql-test/r/innodb_explain_non_select_all.result	revid:mattias.jonsson@stripped
@@ -2782,14 +2782,14 @@ INSERT INTO t2 VALUES (1), (2), (3);
 EXPLAIN UPDATE        t1 SET a = 10 WHERE a IN (SELECT * FROM (SELECT b FROM t2 ORDER BY b LIMIT 2,2) x);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	3	Using where
+2	DEPENDENT SUBQUERY	<derived3>	index_subquery	auto_key0	auto_key0	5	func	2	Using index
 3	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	3	Using filesort
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED UPDATE        t1 SET a = 10 WHERE a IN (SELECT * FROM (SELECT b FROM t2 ORDER BY b LIMIT 2,2) x);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
+2	DEPENDENT SUBQUERY	<derived3>	index_subquery	auto_key0	auto_key0	5	func	2	100.00	Using index
 3	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	3	100.00	Using filesort
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
@@ -2815,8 +2815,8 @@ Sort_scan	1
 # Status of testing query execution:
 Variable_name	Value
 Handler_read_first	2
-Handler_read_key	2
-Handler_read_rnd_next	13
+Handler_read_key	5
+Handler_read_rnd_next	8
 Handler_update	1
 Handler_write	1
 Sort_rows	3

=== modified file 'mysql-test/r/myisam_explain_non_select_all.result'
--- a/mysql-test/r/myisam_explain_non_select_all.result	revid:mattias.jonsson@stripped
+++ b/mysql-test/r/myisam_explain_non_select_all.result	revid:mattias.jonsson@stripped
@@ -2655,14 +2655,14 @@ INSERT INTO t2 VALUES (1), (2), (3);
 EXPLAIN UPDATE        t1 SET a = 10 WHERE a IN (SELECT * FROM (SELECT b FROM t2 ORDER BY b LIMIT 2,2) x);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	3	Using where
+2	DEPENDENT SUBQUERY	<derived3>	index_subquery	auto_key0	auto_key0	5	func	2	Using index
 3	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	3	Using filesort
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED UPDATE        t1 SET a = 10 WHERE a IN (SELECT * FROM (SELECT b FROM t2 ORDER BY b LIMIT 2,2) x);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
+2	DEPENDENT SUBQUERY	<derived3>	index_subquery	auto_key0	auto_key0	5	func	2	100.00	Using index
 3	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	3	100.00	Using filesort
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
@@ -2686,7 +2686,8 @@ Sort_rows	3
 Sort_scan	1
 # Status of testing query execution:
 Variable_name	Value
-Handler_read_rnd_next	13
+Handler_read_key	3
+Handler_read_rnd_next	8
 Handler_update	1
 Handler_write	1
 Sort_rows	3

=== modified file 'mysql-test/suite/opt_trace/r/bugs_no_prot_all.result'
--- a/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result	revid:mattias.jonsson@stripped
+++ b/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result	revid:mattias.jonsson@stripped
@@ -2079,234 +2079,6 @@ SELECT 1 FROM t1 WHERE 1 LIKE
             } /* join_preparation */
           },
           {
-            "subselect_execution": {
-              "select#": 2,
-              "steps": [
-                {
-                  "join_optimization": {
-                    "select#": 2,
-                    "steps": [
-                      {
-                        "condition_processing": {
-                          "condition": "WHERE",
-                          "original_condition": "(`test`.`t1`.`a` = 1)",
-                          "steps": [
-                            {
-                              "transformation": "equality_propagation",
-                              "resulting_condition": "multiple equal(1, `test`.`t1`.`a`)"
-                            },
-                            {
-                              "transformation": "constant_propagation",
-                              "resulting_condition": "multiple equal(1, `test`.`t1`.`a`)"
-                            },
-                            {
-                              "transformation": "trivial_condition_removal",
-                              "resulting_condition": "multiple equal(1, `test`.`t1`.`a`)"
-                            }
-                          ] /* steps */
-                        } /* condition_processing */
-                      },
-                      {
-                        "table_dependencies": [
-                          {
-                            "database": "test",
-                            "table": "t1",
-                            "row_may_be_null": false,
-                            "map_bit": 0,
-                            "depends_on_map_bits": [
-                            ] /* depends_on_map_bits */
-                          }
-                        ] /* table_dependencies */
-                      },
-                      {
-                        "ref_optimizer_key_uses": [
-                          {
-                            "database": "test",
-                            "table": "t1",
-                            "field": "a",
-                            "equals": "1",
-                            "null_rejecting": false
-                          },
-                          {
-                            "database": "test",
-                            "table": "t1",
-                            "field": "a",
-                            "equals": "1",
-                            "null_rejecting": false
-                          }
-                        ] /* ref_optimizer_key_uses */
-                      },
-                      {
-                        "rows_estimation": [
-                          {
-                            "database": "test",
-                            "table": "t1",
-                            "range_analysis": {
-                              "table_scan": {
-                                "rows": 1,
-                                "cost": 3.3
-                              } /* table_scan */,
-                              "potential_range_indices": [
-                                {
-                                  "index": "a",
-                                  "usable": true,
-                                  "key_parts": [
-                                    "a"
-                                  ] /* key_parts */
-                                },
-                                {
-                                  "index": "a_2",
-                                  "usable": true,
-                                  "key_parts": [
-                                    "a",
-                                    "c"
-                                  ] /* key_parts */
-                                }
-                              ] /* potential_range_indices */,
-                              "best_covering_index_scan": {
-                                "index": "a_2",
-                                "cost": 1.2,
-                                "chosen": true
-                              } /* best_covering_index_scan */,
-                              "setup_range_conditions": [
-                              ] /* setup_range_conditions */,
-                              "group_index_range": {
-                                "chosen": false,
-                                "cause": "not_group_by_or_distinct"
-                              } /* group_index_range */,
-                              "analyzing_range_alternatives": {
-                                "range_scan_alternatives": [
-                                  {
-                                    "index": "a",
-                                    "index_dives_for_eq_ranges": true,
-                                    "ranges": [
-                                      "1 <= a <= 1"
-                                    ] /* ranges */,
-                                    "index_only": false,
-                                    "rows": 1,
-                                    "cost": 2.21,
-                                    "rowid_ordered": true,
-                                    "chosen": false,
-                                    "cause": "cost"
-                                  },
-                                  {
-                                    "index": "a_2",
-                                    "index_dives_for_eq_ranges": true,
-                                    "ranges": [
-                                      "1 <= a <= 1"
-                                    ] /* ranges */,
-                                    "index_only": true,
-                                    "rows": 1,
-                                    "cost": 2.21,
-                                    "rowid_ordered": false,
-                                    "chosen": false,
-                                    "cause": "cost"
-                                  }
-                                ] /* range_scan_alternatives */,
-                                "analyzing_roworder_intersect": {
-                                  "usable": false,
-                                  "cause": "too_few_roworder_scans"
-                                } /* analyzing_roworder_intersect */
-                              } /* analyzing_range_alternatives */
-                            } /* range_analysis */
-                          }
-                        ] /* rows_estimation */
-                      },
-                      {
-                        "considered_execution_plans": [
-                          {
-                            "database": "test",
-                            "table": "t1",
-                            "best_access_path": {
-                              "considered_access_paths": [
-                                {
-                                  "access_type": "ref",
-                                  "index": "a",
-                                  "rows": 1,
-                                  "cost": 1.2,
-                                  "chosen": true
-                                },
-                                {
-                                  "access_type": "ref",
-                                  "index": "a_2",
-                                  "rows": 1,
-                                  "cost": 1.2,
-                                  "chosen": false
-                                },
-                                {
-                                  "access_type": "scan",
-                                  "cause": "covering_index_better_than_full_scan",
-                                  "chosen": false
-                                }
-                              ] /* considered_access_paths */
-                            } /* best_access_path */,
-                            "cost_for_plan": 1.2,
-                            "rows_for_plan": 1,
-                            "chosen": true
-                          }
-                        ] /* considered_execution_plans */
-                      },
-                      {
-                        "attaching_conditions_to_tables": {
-                          "original_condition": "(`test`.`t1`.`a` = 1)",
-                          "attached_conditions_computation": [
-                          ] /* attached_conditions_computation */,
-                          "attached_conditions_summary": [
-                            {
-                              "database": "test",
-                              "table": "t1",
-                              "attached": null
-                            }
-                          ] /* attached_conditions_summary */
-                        } /* attaching_conditions_to_tables */
-                      },
-                      {
-                        "clause_processing": {
-                          "clause": "ORDER BY",
-                          "original_clause": "`test`.`t1`.`c`",
-                          "items": [
-                            {
-                              "item": "`test`.`t1`.`c`"
-                            }
-                          ] /* items */,
-                          "resulting_clause_is_simple": true,
-                          "resulting_clause": "`test`.`t1`.`c`"
-                        } /* clause_processing */
-                      },
-                      {
-                        "refine_plan": [
-                          {
-                            "database": "test",
-                            "table": "t1"
-                          }
-                        ] /* refine_plan */
-                      }
-                    ] /* steps */
-                  } /* join_optimization */
-                },
-                {
-                  "join_execution": {
-                    "select#": 2,
-                    "steps": [
-                      {
-                        "reconsidering_access_paths_for_index_ordering": {
-                          "index_order_summary": {
-                            "database": "test",
-                            "table": "t1",
-                            "index": "a_2",
-                            "order_direction": "asc",
-                            "plan_changed": true,
-                            "access_type": "ref"
-                          } /* index_order_summary */
-                        } /* reconsidering_access_paths_for_index_ordering */
-                      }
-                    ] /* steps */
-                  } /* join_execution */
-                }
-              ] /* steps */
-            } /* subselect_execution */
-          },
-          {
             "expanded_query": "/* select#1 */ select 1 AS `1` from `test`.`t1` where (1 like (/* select#2 */ select `test`.`t1`.`a` from `test`.`t1` where (`test`.`t1`.`a` = 1) order by `test`.`t1`.`c`))"
           }
         ] /* steps */
@@ -2340,6 +2112,227 @@ SELECT 1 FROM t1 WHERE 1 LIKE
                       "subselect_execution": {
                         "select#": 2,
                         "steps": [
+                          {
+                            "join_optimization": {
+                              "select#": 2,
+                              "steps": [
+                                {
+                                  "condition_processing": {
+                                    "condition": "WHERE",
+                                    "original_condition": "(`test`.`t1`.`a` = 1)",
+                                    "steps": [
+                                      {
+                                        "transformation": "equality_propagation",
+                                        "resulting_condition": "multiple equal(1, `test`.`t1`.`a`)"
+                                      },
+                                      {
+                                        "transformation": "constant_propagation",
+                                        "resulting_condition": "multiple equal(1, `test`.`t1`.`a`)"
+                                      },
+                                      {
+                                        "transformation": "trivial_condition_removal",
+                                        "resulting_condition": "multiple equal(1, `test`.`t1`.`a`)"
+                                      }
+                                    ] /* steps */
+                                  } /* condition_processing */
+                                },
+                                {
+                                  "table_dependencies": [
+                                    {
+                                      "database": "test",
+                                      "table": "t1",
+                                      "row_may_be_null": false,
+                                      "map_bit": 0,
+                                      "depends_on_map_bits": [
+                                      ] /* depends_on_map_bits */
+                                    }
+                                  ] /* table_dependencies */
+                                },
+                                {
+                                  "ref_optimizer_key_uses": [
+                                    {
+                                      "database": "test",
+                                      "table": "t1",
+                                      "field": "a",
+                                      "equals": "1",
+                                      "null_rejecting": false
+                                    },
+                                    {
+                                      "database": "test",
+                                      "table": "t1",
+                                      "field": "a",
+                                      "equals": "1",
+                                      "null_rejecting": false
+                                    }
+                                  ] /* ref_optimizer_key_uses */
+                                },
+                                {
+                                  "rows_estimation": [
+                                    {
+                                      "database": "test",
+                                      "table": "t1",
+                                      "range_analysis": {
+                                        "table_scan": {
+                                          "rows": 1,
+                                          "cost": 3.3
+                                        } /* table_scan */,
+                                        "potential_range_indices": [
+                                          {
+                                            "index": "a",
+                                            "usable": true,
+                                            "key_parts": [
+                                              "a"
+                                            ] /* key_parts */
+                                          },
+                                          {
+                                            "index": "a_2",
+                                            "usable": true,
+                                            "key_parts": [
+                                              "a",
+                                              "c"
+                                            ] /* key_parts */
+                                          }
+                                        ] /* potential_range_indices */,
+                                        "best_covering_index_scan": {
+                                          "index": "a_2",
+                                          "cost": 1.2,
+                                          "chosen": true
+                                        } /* best_covering_index_scan */,
+                                        "setup_range_conditions": [
+                                        ] /* setup_range_conditions */,
+                                        "group_index_range": {
+                                          "chosen": false,
+                                          "cause": "not_group_by_or_distinct"
+                                        } /* group_index_range */,
+                                        "analyzing_range_alternatives": {
+                                          "range_scan_alternatives": [
+                                            {
+                                              "index": "a",
+                                              "index_dives_for_eq_ranges": true,
+                                              "ranges": [
+                                                "1 <= a <= 1"
+                                              ] /* ranges */,
+                                              "index_only": false,
+                                              "rows": 1,
+                                              "cost": 2.21,
+                                              "rowid_ordered": true,
+                                              "chosen": false,
+                                              "cause": "cost"
+                                            },
+                                            {
+                                              "index": "a_2",
+                                              "index_dives_for_eq_ranges": true,
+                                              "ranges": [
+                                                "1 <= a <= 1"
+                                              ] /* ranges */,
+                                              "index_only": true,
+                                              "rows": 1,
+                                              "cost": 2.21,
+                                              "rowid_ordered": false,
+                                              "chosen": false,
+                                              "cause": "cost"
+                                            }
+                                          ] /* range_scan_alternatives */,
+                                          "analyzing_roworder_intersect": {
+                                            "usable": false,
+                                            "cause": "too_few_roworder_scans"
+                                          } /* analyzing_roworder_intersect */
+                                        } /* analyzing_range_alternatives */
+                                      } /* range_analysis */
+                                    }
+                                  ] /* rows_estimation */
+                                },
+                                {
+                                  "considered_execution_plans": [
+                                    {
+                                      "database": "test",
+                                      "table": "t1",
+                                      "best_access_path": {
+                                        "considered_access_paths": [
+                                          {
+                                            "access_type": "ref",
+                                            "index": "a",
+                                            "rows": 1,
+                                            "cost": 1.2,
+                                            "chosen": true
+                                          },
+                                          {
+                                            "access_type": "ref",
+                                            "index": "a_2",
+                                            "rows": 1,
+                                            "cost": 1.2,
+                                            "chosen": false
+                                          },
+                                          {
+                                            "access_type": "scan",
+                                            "cause": "covering_index_better_than_full_scan",
+                                            "chosen": false
+                                          }
+                                        ] /* considered_access_paths */
+                                      } /* best_access_path */,
+                                      "cost_for_plan": 1.2,
+                                      "rows_for_plan": 1,
+                                      "chosen": true
+                                    }
+                                  ] /* considered_execution_plans */
+                                },
+                                {
+                                  "attaching_conditions_to_tables": {
+                                    "original_condition": "(`test`.`t1`.`a` = 1)",
+                                    "attached_conditions_computation": [
+                                    ] /* attached_conditions_computation */,
+                                    "attached_conditions_summary": [
+                                      {
+                                        "database": "test",
+                                        "table": "t1",
+                                        "attached": null
+                                      }
+                                    ] /* attached_conditions_summary */
+                                  } /* attaching_conditions_to_tables */
+                                },
+                                {
+                                  "clause_processing": {
+                                    "clause": "ORDER BY",
+                                    "original_clause": "`test`.`t1`.`c`",
+                                    "items": [
+                                      {
+                                        "item": "`test`.`t1`.`c`"
+                                      }
+                                    ] /* items */,
+                                    "resulting_clause_is_simple": true,
+                                    "resulting_clause": "`test`.`t1`.`c`"
+                                  } /* clause_processing */
+                                },
+                                {
+                                  "refine_plan": [
+                                    {
+                                      "database": "test",
+                                      "table": "t1"
+                                    }
+                                  ] /* refine_plan */
+                                }
+                              ] /* steps */
+                            } /* join_optimization */
+                          },
+                          {
+                            "join_execution": {
+                              "select#": 2,
+                              "steps": [
+                                {
+                                  "reconsidering_access_paths_for_index_ordering": {
+                                    "index_order_summary": {
+                                      "database": "test",
+                                      "table": "t1",
+                                      "index": "a_2",
+                                      "order_direction": "asc",
+                                      "plan_changed": true,
+                                      "access_type": "ref"
+                                    } /* index_order_summary */
+                                  } /* reconsidering_access_paths_for_index_ordering */
+                                }
+                              ] /* steps */
+                            } /* join_execution */
+                          }
                         ] /* steps */
                       } /* subselect_execution */
                     }

=== modified file 'mysql-test/suite/opt_trace/r/range_no_prot.result'
--- a/mysql-test/suite/opt_trace/r/range_no_prot.result	revid:mattias.jonsson@stripped
+++ b/mysql-test/suite/opt_trace/r/range_no_prot.result	revid:mattias.jonsson@stripped
@@ -4008,13 +4008,11 @@ EXPLAIN SELECT 1 FROM 
                         "chosen": true
                       } /* best_covering_index_scan */,
                       "setup_range_conditions": [
-                        {
-                          "impossible_condition": {
-                            "cause": "comparison_with_null_always_false"
-                          } /* impossible_condition */
-                        }
                       ] /* setup_range_conditions */,
-                      "impossible_range": true
+                      "group_index_range": {
+                        "chosen": false,
+                        "cause": "not_single_table"
+                      } /* group_index_range */
                     } /* range_analysis */
                   } /* rows_estimation_per_outer_row */
                 },
@@ -4042,13 +4040,11 @@ EXPLAIN SELECT 1 FROM 
                         "chosen": true
                       } /* best_covering_index_scan */,
                       "setup_range_conditions": [
-                        {
-                          "impossible_condition": {
-                            "cause": "comparison_with_null_always_false"
-                          } /* impossible_condition */
-                        }
                       ] /* setup_range_conditions */,
-                      "impossible_range": true
+                      "group_index_range": {
+                        "chosen": false,
+                        "cause": "not_single_table"
+                      } /* group_index_range */
                     } /* range_analysis */
                   } /* rows_estimation_per_outer_row */
                 }
@@ -4359,13 +4355,11 @@ EXPLAIN SELECT 1 FROM 
                         "chosen": true
                       } /* best_covering_index_scan */,
                       "setup_range_conditions": [
-                        {
-                          "impossible_condition": {
-                            "cause": "comparison_with_null_always_false"
-                          } /* impossible_condition */
-                        }
                       ] /* setup_range_conditions */,
-                      "impossible_range": true
+                      "group_index_range": {
+                        "chosen": false,
+                        "cause": "not_single_table"
+                      } /* group_index_range */
                     } /* range_analysis */
                   } /* rows_estimation_per_outer_row */
                 }

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (mattias.jonsson:3833 to 3834) WL#4443Mattias Jonsson8 Feb