bzr push into mysql-6.0-opt branch (sergefp:2674 to 2675)

[Sergey Petrunia]

 2675 Sergey Petrunia	2008-07-20
      Better comments
modified:
  sql/sql_select.cc

 2674 Sergey Petrunia	2008-07-19 [merge]
      mysql-6.0 <-> mysql-6.0-opt merge
modified:
  .bzr-mysql/default.conf
  configure.in
  mysql-test/r/constraints.result
  mysql-test/r/sp-error.result
  mysql-test/r/subselect.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_semijoin.result
  mysql-test/r/subselect_sj.result
  mysql-test/r/subselect_sj2.result
  mysql-test/t/constraints.test
  mysql-test/t/sp-error.test
  mysql-test/t/subselect.test
  mysql-test/t/subselect_sj.test
  mysql-test/t/subselect_sj2.test
  sql/handler.cc
  sql/handler.h
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/sp_pcontext.cc
  sql/sql_select.cc
  sql/sql_select.h
  sql/sql_yacc.yy
  sql/structs.h

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-07-19 14:21:51 +0000
+++ b/sql/sql_select.cc	2008-07-20 13:23:23 +0000
@@ -12383,9 +12383,11 @@ err:
   SYNOPSIS
 
     create_duplicate_weedout_tmp_table()
-      thd
-      uniq_tuple_length_arg
-      SJ_TMP_TABLE 
+      thd                    Thread handle
+      uniq_tuple_length_arg  Length of the table's column
+      sjtbl                  Update sjtbl->[start_]recinfo values which 
+                             will be needed if we'll need to convert the 
+                             created temptable from HEAP to MyISAM/Maria.
 
   DESCRIPTION
     Create a temporary table to weed out duplicate rowid combinations. The