Fix for the previous cset: make first_explain_order_tab handle degenerate joins

spetrunia · spetrunia · commit e20e28bd2eca · 2016-08-10T01:13:09.000+03:00
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
@@ -8365,6 +8365,8 @@ JOIN_TAB *first_explain_order_tab(JOIN* join)
 {
   JOIN_TAB* tab;
   tab= join->join_tab;
+  if (!tab)
+    return NULL; /* Can happen when when the tables were optimized away */
   return (tab->bush_children) ? tab->bush_children->start : tab;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8365,6 +8365,8 @@ JOIN_TAB first_explain_order_tab(JOIN join)`
`8365`	`8365`	`{`
`8366`	`8366`	`JOIN_TAB* tab;`
`8367`	`8367`	`tab= join->join_tab;`
	`8368`	`+ if (!tab)`
	`8369`	`+ return NULL; /* Can happen when when the tables were optimized away */`
`8368`	`8370`	`return (tab->bush_children) ? tab->bush_children->start : tab;`
`8369`	`8371`	`}`
`8370`	`8372`