bzr push into mysql-trunk branch (roy.lyseng:3914 to 3915) Bug#13956813

[Roy Lyseng]

 3915 Roy Lyseng	2012-05-29
      Bug#13956813: Segfault in memcpy from Join_cache::write_record_data()
      
      Followup of review comment

    modified:
      sql/sql_executor.cc
 3914 Roy Lyseng	2012-05-25
      Bug#14058892: Extra rows returned when variable is used in subquery in
                    ON clause of RIGHT JOIN.
      
      Followup to commit comment
      
      sql/sql_optimizer.cc
        Change code comment.

    modified:
      sql/sql_optimizer.cc
=== modified file 'sql/sql_executor.cc'
--- a/sql/sql_executor.cc	2012-05-24 11:55:37 +0000
+++ b/sql/sql_executor.cc	2012-05-29 09:30:56 +0000
@@ -1868,7 +1868,7 @@ sub_select_sjm(JOIN *join, JOIN_TAB *joi
 
 
 /**
-  Perform one-time initializations for a join_tab object.
+  Perform one-time materialization for a join_tab object.
 
   Includes derived table materialization and binding of rowid buffers,
   if needed.

No bundle (reason: useless for push emails).