SQL: NATUAL JOIN on view + table [fixes #148]

mysql-test/suite/versioning/r/select.result

@@ -418,6 +418,13 @@ select * from v1;
 a
 1
 drop view v1;
+create or replace table t1 (a int) with system versioning;
+insert into t1 values (1);
+create view vt1 as select a from t1;
+select * from t1 natural join vt1;
+a
+1
+drop view vt1;
 drop table t1, t2;
 call verify_vtq;
 No	A	B	C	D

mysql-test/suite/versioning/t/select.test

@@ -142,6 +142,12 @@ create view v1 as select * from t2 inner join t1 using (a);
 select * from v1;
 drop view v1;
 
+create or replace table t1 (a int) with system versioning;
+insert into t1 values (1);
+create view vt1 as select a from t1;
+select * from t1 natural join vt1;
+drop view vt1;
+
 drop table t1, t2;
 
 call verify_vtq;

sql/sql_select.cc

@@ -832,7 +832,8 @@ int vers_setup_select(THD *thd, TABLE_LIST *tables, COND **where_expr,
 
       Item *row_start= NULL;
       Item *row_end= NULL;
-      if (table->is_derived() && !table->is_recursive_with_table())
+      if ((table->is_derived() && !table->is_recursive_with_table()) ||
+          table->join_columns)
       {
         row_start= newx Item_field(thd, &slex->context, NULL, NULL,
                                    fstart->field_name);