Buildbot fixes:

- Don't call table_list->process_index_hints() for JTBM pseudo-tables
- Update test results

mysql-test/t/subselect_sj_mat.test

@@ -5,6 +5,8 @@
 
 --disable_warnings
 drop table if exists t1, t2, t3, t1i, t2i, t3i;
+drop table if exists columns;
+drop table if exists t1_16, t2_16, t3_16;
 drop view if exists v1, v2, v1m, v2m;
 --enable_warnings
 

sql/sql_base.cc

@@ -7774,10 +7774,12 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
       table_list->jtbm_table_no= tablenr;
     }
     else
+    {
       setup_table_map(table, table_list, tablenr);
 
-    if (table_list->process_index_hints(table))
-      DBUG_RETURN(1);
+      if (table_list->process_index_hints(table))
+        DBUG_RETURN(1);
+    }
   }
   if (tablenr > MAX_TABLES)
   {

sql/sql_select.cc

@@ -7928,7 +7928,9 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
 
 	sel->head=tab->table;
         DBUG_EXECUTE("where",
-                     print_where(tmp,tab->table->alias.c_ptr(),
+                     print_where(tmp, 
+                                 tab->table ? tab->table->alias.c_ptr() :
+                                   "(sjm-nest)",
                                  QT_ORDINARY););
 	if (tab->quick)
 	{