bzr push into mysql-5.1 branch (kgeorge:2691)

[Georgi Kodinov]

 2691 Georgi Kodinov	2008-11-03 [merge]
      merged 5.1-bugteam -> B33811 5.1 working tree
modified:
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result

=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2008-10-16 01:50:56 +0000
+++ b/mysql-test/r/sp.result	2008-11-03 10:40:58 +0000
@@ -6820,6 +6820,24 @@ ttt
 2
 drop function func30787;
 drop table t1;
+CREATE TABLE t1 (id INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+CREATE PROCEDURE test_sp()
+SELECT t1.* FROM t1 RIGHT JOIN t1 t2 ON t1.id=t2.id;
+CALL test_sp();
+id
+1
+2
+3
+4
+CALL test_sp();
+id
+1
+2
+3
+4
+DROP PROCEDURE test_sp;
+DROP TABLE t1;
 create table t1(c1 INT);
 create function f1(p1 int) returns varchar(32)
 return 'aaa';

=== modified file 'mysql-test/t/sp.test'
--- a/mysql-test/t/sp.test	2008-10-16 01:50:56 +0000
+++ b/mysql-test/t/sp.test	2008-11-03 10:40:58 +0000
@@ -7997,8 +7997,24 @@ select (select func30787(f1)) as ttt fro
 drop function func30787;
 drop table t1;
 
-###########################################################################
+#
+# Bug #33811: Call to stored procedure with SELECT * / RIGHT JOIN fails
+# after the first time
+#
+CREATE TABLE t1 (id INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+
+CREATE PROCEDURE test_sp()
+  SELECT t1.* FROM t1 RIGHT JOIN t1 t2 ON t1.id=t2.id;
 
+CALL test_sp();
+CALL test_sp();
+
+DROP PROCEDURE test_sp;
+DROP TABLE t1;
+
+
+###########################################################################
 #
 # Bug#38291 memory corruption and server crash with view/sp/function
 #

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2008-10-13 10:22:36 +0000
+++ b/sql/sql_base.cc	2008-11-03 10:40:58 +0000
@@ -7768,6 +7768,10 @@ insert_fields(THD *thd, Name_resolution_
 
       if (!(item= field_iterator.create_item(thd)))
         DBUG_RETURN(TRUE);
+      DBUG_ASSERT(item->fixed);
+      /* cache the table for the Item_fields inserted by expanding stars */
+      if (item->type() == Item::FIELD_ITEM && tables->cacheable_table)
+        ((Item_field *)item)->cached_table= tables;
 
       if (!found)
       {

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-10-16 18:04:31 +0000
+++ b/sql/sql_select.cc	2008-11-03 10:40:58 +0000
@@ -8586,6 +8586,8 @@ simplify_joins(JOIN *join, List<TABLE_LI
   }
     
   /* Flatten nested joins that can be flattened. */
+  TABLE_LIST *right_neighbor= NULL;
+  bool fix_name_res= FALSE;
   li.rewind();
   while ((table= li++))
   {
@@ -8598,9 +8600,17 @@ simplify_joins(JOIN *join, List<TABLE_LI
       {
         tbl->embedding= table->embedding;
         tbl->join_list= table->join_list;
-      }      
+      }
       li.replace(nested_join->join_list);
-    }
+      /* Need to update the name resolution table chain when flattening joins */
+      fix_name_res= TRUE;
+      table= *li.ref();
+    }
+    if (fix_name_res)
+      table->next_name_resolution_table= right_neighbor ?
+        right_neighbor->first_leaf_for_name_resolution() :
+        NULL;
+    right_neighbor= table;
   }
   DBUG_RETURN(conds); 
 }