bzr push into mysql-6.0 branch (sergefp:2738 to 2739)

[Sergey Petrunia]

 2739 Sergey Petrunia	2009-04-18
      Better comments
modified:
  sql/sql_select.h

 2738 Sergey Petrunia	2009-04-16 [merge]
      Merge mysql-6.0 -> mysql-6.0-opt
removed:
  mysql-test/suite/falcon/r/falcon_bug_22178.result
  mysql-test/suite/falcon/t/falcon_bug_22178.test
added:
  mysql-test/collections/falcon_team.experimental
  mysql-test/collections/mysql-6.0-falcon-.push
  mysql-test/suite/falcon/r/falcon_bug_42208.result
  mysql-test/suite/falcon/r/falcon_bug_42405.result
  mysql-test/suite/falcon/r/falcon_index_v2.result
  mysql-test/suite/falcon/t/falcon_bug_42208.test
  mysql-test/suite/falcon/t/falcon_bug_42405.test
  mysql-test/suite/falcon/t/falcon_index_v2.test
  sql/rpl_info.cc
  sql/rpl_info.h
  sql/rpl_mi_file.cc
  sql/rpl_mi_file.h
  sql/rpl_rli_file.cc
  sql/rpl_rli_file.h
modified:
  .bzr-mysql/default.conf
  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
  mysql-test/lib/My/CoreDump.pm
  mysql-test/mysql-test-run.pl
  mysql-test/r/mysqldump.result
  mysql-test/suite/falcon/r/falcon_bug_22939.result
  mysql-test/suite/falcon/r/falcon_bug_22972.result
  mysql-test/suite/falcon/r/falcon_bug_24024.result
  mysql-test/suite/falcon/r/falcon_bug_26827.result
  mysql-test/suite/falcon/r/falcon_bug_26828.result
  mysql-test/suite/falcon/r/falcon_bug_28042.result
  mysql-test/suite/falcon/r/falcon_bug_29332.result
  mysql-test/suite/falcon/r/falcon_bug_30826.result
  mysql-test/suite/falcon/r/falcon_bug_32833.result
  mysql-test/suite/falcon/r/falcon_bug_33404.result
  mysql-test/suite/falcon/r/falcon_bugs.result
  mysql-test/suite/falcon/t/disabled.def
  mysql-test/suite/falcon/t/falcon_bug_22845.test
  mysql-test/suite/falcon/t/falcon_bug_22939.test
  mysql-test/suite/falcon/t/falcon_bug_22972.test
  mysql-test/suite/falcon/t/falcon_bug_24024.test
  mysql-test/suite/falcon/t/falcon_bug_26827.test
  mysql-test/suite/falcon/t/falcon_bug_26828.test
  mysql-test/suite/falcon/t/falcon_bug_28026.test
  mysql-test/suite/falcon/t/falcon_bug_28042.test
  mysql-test/suite/falcon/t/falcon_bug_29332.test
  mysql-test/suite/falcon/t/falcon_bug_30826.test
  mysql-test/suite/falcon/t/falcon_bug_30878.test
  mysql-test/suite/falcon/t/falcon_bug_32833.test
  mysql-test/suite/falcon/t/falcon_bug_33404.test
  mysql-test/suite/falcon/t/falcon_bugs.test
  mysql-test/suite/falcon_team/t/test2bug.def
  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
  mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.cnf
  mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
  sql/CMakeLists.txt
  sql/Makefile.am
  sql/ha_ndbcluster.cc
  sql/item_func.cc
  sql/log.cc
  sql/log_event.cc
  sql/log_event_old.cc
  sql/mysqld.cc
  sql/rpl_mi.cc
  sql/rpl_mi.h
  sql/rpl_record.cc
  sql/rpl_record.h
  sql/rpl_reporting.cc
  sql/rpl_reporting.h
  sql/rpl_rli.cc
  sql/rpl_rli.h
  sql/set_var.cc
  sql/slave.cc
  sql/slave.h
  sql/sp_head.cc
  sql/sql_acl.cc
  sql/sql_acl.h
  sql/sql_binlog.cc
  sql/sql_insert.cc
  sql/sql_load.cc
  sql/sql_parse.cc
  sql/sql_repl.cc
  storage/falcon/Cache.cpp
  storage/falcon/CycleManager.cpp
  storage/falcon/CycleManager.h
  storage/falcon/Database.cpp
  storage/falcon/Database.h
  storage/falcon/Dbb.cpp
  storage/falcon/Dbb.h
  storage/falcon/DeferredIndex.cpp
  storage/falcon/ErrorInjector.cpp
  storage/falcon/ErrorInjector.h
  storage/falcon/IO.cpp
  storage/falcon/Index.cpp
  storage/falcon/Index.h
  storage/falcon/Index2RootPage.cpp
  storage/falcon/IndexPage.cpp
  storage/falcon/IndexPage.h
  storage/falcon/IndexRootPage.cpp
  storage/falcon/Inversion.cpp
  storage/falcon/Inversion.h
  storage/falcon/Record.cpp
  storage/falcon/Record.h
  storage/falcon/RecordLeaf.cpp
  storage/falcon/RecordLocatorPage.cpp
  storage/falcon/RecordLocatorPage.h
  storage/falcon/RecordScavenge.cpp
  storage/falcon/RecordVersion.cpp
  storage/falcon/RecordVersion.h
  storage/falcon/RepositoryVolume.cpp
  storage/falcon/SRLCreateIndex.cpp
  storage/falcon/SRLDeleteIndex.cpp
  storage/falcon/SRLIndexPage.cpp
  storage/falcon/SRLUpdateIndex.cpp
  storage/falcon/SRLUpdateRecords.cpp
  storage/falcon/Section.cpp
  storage/falcon/SerialLog.cpp
  storage/falcon/SerialLog.h
  storage/falcon/Statement.cpp
  storage/falcon/StorageDatabase.cpp
  storage/falcon/StorageVersion.h
  storage/falcon/Table.cpp
  storage/falcon/Table.h
  storage/falcon/TableSpace.cpp
  storage/falcon/Transaction.cpp
  storage/falcon/Transaction.h

=== modified file 'sql/sql_select.h'
--- a/sql/sql_select.h	2009-04-16 02:25:27 +0000
+++ b/sql/sql_select.h	2009-04-17 21:12:36 +0000
@@ -225,13 +225,13 @@ typedef struct st_join_table
   Item          *cache_idx_cond;
   SQL_SELECT    *cache_select;
   JOIN		*join;
-  /* SemiJoinDuplicateElimination variables: */
   /*
     Embedding SJ-nest (may be not the direct parent), or NULL if none.
     This variable holds the result of table pullout.
   */
   TABLE_LIST    *emb_sj_nest;
-
+  
+  /* FirstMatch variables (final QEP) */
   struct st_join_table *first_sj_inner_tab;
   struct st_join_table *last_sj_inner_tab;