bzr push into mysql-6.0-runtime branch (davi:2701 to 2702)

[Davi Arnaut]

 2702 Davi Arnaut	2008-08-12
      Implement suggestion by Konstantin to make transaction.h header
      self-contained by including it first in transaction.cc
modified:
  sql/transaction.cc
  sql/transaction.h

 2701 Alexander Nozdrin	2008-08-12 [merge]
      Pull 6.0 into 6.0-rt
removed:
  mysql-test/include/wait_timeout_basic.inc
added:
  mysql-test/include/have_nodebug.inc
  mysql-test/r/have_nodebug.require
  mysql-test/r/sp-no-code.result
  mysql-test/suite/falcon/r/falcon_bug_35939.result
  mysql-test/suite/falcon/r/falcon_bug_38039.result
  mysql-test/suite/falcon/t/falcon_bug_35939.test
  mysql-test/suite/falcon/t/falcon_bug_38039.test
  mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc
  mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
  mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
  mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
  mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
  mysql-test/t/sp-no-code.test
renamed:
  mysql-test/suite/falcon_team/r/falcon_bug_23962.result =>
mysql-test/suite/falcon/r/falcon_bug_23962.result
  mysql-test/suite/falcon_team/r/falcon_bug_27997.result =>
mysql-test/suite/falcon/r/falcon_bug_27997.result
  mysql-test/suite/falcon_team/r/falcon_bug_37080.result =>
mysql-test/suite/falcon/r/falcon_bug_37080.result
  mysql-test/suite/falcon_team/t/falcon_bug_23962.test =>
mysql-test/suite/falcon/t/falcon_bug_23962.test
  mysql-test/suite/falcon_team/t/falcon_bug_27997.test =>
mysql-test/suite/falcon/t/falcon_bug_27997.test
  mysql-test/suite/falcon_team/t/falcon_bug_37080.test =>
mysql-test/suite/falcon/t/falcon_bug_37080.test
modified:
  client/Makefile.am
  client/mysql_upgrade.c
  client/mysqltest.c
  config/ac-macros/character_sets.m4
  configure.in
  extra/comp_err.c
  extra/perror.c
  mysql-test/mysql-test-run.pl
  mysql-test/r/func_if.result
  mysql-test/r/perror.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/suite/falcon/r/falcon_bug_22161.result
  mysql-test/suite/falcon/r/falcon_bug_31295.result
  mysql-test/suite/falcon/r/falcon_bug_33404.result
  mysql-test/suite/falcon/r/falcon_options.result
  mysql-test/suite/falcon/r/falcon_options2.result
  mysql-test/suite/falcon/t/falcon_bug_22161.test
  mysql-test/suite/falcon/t/falcon_bug_31295.test
  mysql-test/suite/falcon/t/falcon_bug_33404.test
  mysql-test/suite/falcon/t/falcon_options2.test
  mysql-test/suite/funcs_1/r/falcon_storedproc.result
  mysql-test/suite/funcs_1/r/falcon_trig_03.result
  mysql-test/suite/funcs_1/r/falcon_trig_03e.result
  mysql-test/suite/funcs_1/r/innodb_storedproc.result
  mysql-test/suite/funcs_1/r/innodb_trig_03.result
  mysql-test/suite/funcs_1/r/innodb_trig_03e.result
  mysql-test/suite/funcs_1/r/is_columns_is_falcon.result
  mysql-test/suite/funcs_1/r/is_columns_mysql.result
  mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
  mysql-test/suite/funcs_1/r/is_user_privileges.result
  mysql-test/suite/funcs_1/r/memory_storedproc.result
  mysql-test/suite/funcs_1/r/memory_trig_03.result
  mysql-test/suite/funcs_1/r/memory_trig_03e.result
  mysql-test/suite/funcs_1/r/myisam_storedproc.result
  mysql-test/suite/funcs_1/r/myisam_trig_03.result
  mysql-test/suite/funcs_1/r/myisam_trig_03e.result
  mysql-test/suite/funcs_1/r/ndb_storedproc.result
  mysql-test/suite/funcs_1/r/ndb_trig_03.result
  mysql-test/suite/funcs_1/r/ndb_trig_03e.result
  mysql-test/suite/funcs_1/triggers/triggers_03.inc
  mysql-test/suite/funcs_1/triggers/triggers_08.inc
  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
  mysql-test/suite/ndb/r/ndb_basic.result
  mysql-test/suite/ndb/t/disabled.def
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/t/func_if.test
  mysql-test/t/information_schema-master.opt
  mysql-test/t/information_schema_db-master.opt
  mysql-test/t/mysqlshow-master.opt
  mysql-test/t/perror.test
  mysql-test/t/subselect.test
  mysql-test/t/variables-master.opt
  scripts/mysql_system_tables_fix.sql
  sql/field.h
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_func.cc
  sql/mysql_priv.h
  sql/share/errmsg.txt
  sql/sp_head.cc
  sql/sql_acl.cc
  sql/sql_base.cc
  sql/sql_error.cc
  sql/sql_error.h
  sql/sql_lex.h
  sql/sql_list.h
  sql/sql_parse.cc
  sql/sql_select.cc
  sql/sql_string.h
  sql/sql_yacc.yy
  sql/table.cc
  sql/table.h
  sql/thr_malloc.cc
  storage/falcon/BDB.cpp
  storage/falcon/BDB.h
  storage/falcon/BackLog.cpp
  storage/falcon/Cache.cpp
  storage/falcon/CollationManager.cpp
  storage/falcon/CompiledStatement.cpp
  storage/falcon/Configuration.cpp
  storage/falcon/Configuration.h
  storage/falcon/Connection.cpp
  storage/falcon/Database.cpp
  storage/falcon/DatabaseClone.cpp
  storage/falcon/DatabaseCopy.cpp
  storage/falcon/Dbb.cpp
  storage/falcon/Dbb.h
  storage/falcon/DeferredIndex.cpp
  storage/falcon/DeferredIndex.h
  storage/falcon/Gopher.cpp
  storage/falcon/IO.cpp
  storage/falcon/IOx.h
  storage/falcon/Index.cpp
  storage/falcon/IndexWalker.cpp
  storage/falcon/IndexWalker.h
  storage/falcon/Inversion.cpp
  storage/falcon/LicenseManager.cpp
  storage/falcon/Makefile.am
  storage/falcon/MemMgr.cpp
  storage/falcon/RecordLeaf.cpp
  storage/falcon/RecordVersion.cpp
  storage/falcon/RecoveryObjects.cpp
  storage/falcon/RecoveryObjects.h
  storage/falcon/Repository.cpp
  storage/falcon/RepositoryManager.cpp
  storage/falcon/RepositoryVolume.cpp
  storage/falcon/ResultSet.cpp
  storage/falcon/Role.cpp
  storage/falcon/SQLParse.cpp
  storage/falcon/SRLCreateTableSpace.cpp
  storage/falcon/SRLCreateTableSpace.h
  storage/falcon/SRLDeleteIndex.cpp
  storage/falcon/SRLPrepare.cpp
  storage/falcon/SRLRollback.cpp
  storage/falcon/SRLUpdateIndex.cpp
  storage/falcon/Scheduler.cpp
  storage/falcon/SectorBuffer.cpp
  storage/falcon/SectorCache.cpp
  storage/falcon/SequenceManager.cpp
  storage/falcon/SerialLog.cpp
  storage/falcon/SerialLog.h
  storage/falcon/SerialLogFile.cpp
  storage/falcon/Server.cpp
  storage/falcon/SessionManager.cpp
  storage/falcon/Statement.cpp
  storage/falcon/StorageDatabase.cpp
  storage/falcon/StorageDatabase.h
  storage/falcon/StorageHandler.cpp
  storage/falcon/StorageHandler.h
  storage/falcon/StorageTableShare.cpp
  storage/falcon/SymbolManager.cpp
  storage/falcon/Sync.cpp
  storage/falcon/Sync.h
  storage/falcon/SyncObject.cpp
  storage/falcon/SyncObject.h
  storage/falcon/SyncTest.cpp
  storage/falcon/Table.cpp
  storage/falcon/TableSpace.cpp
  storage/falcon/TableSpace.h
  storage/falcon/TableSpaceManager.cpp
  storage/falcon/TableSpaceManager.h
  storage/falcon/Thread.cpp
  storage/falcon/Threads.cpp
  storage/falcon/Transaction.cpp
  storage/falcon/Transaction.h
  storage/falcon/TransactionManager.cpp
  storage/falcon/WalkDeferred.cpp
  storage/falcon/WalkDeferred.h
  storage/falcon/WalkIndex.cpp
  storage/falcon/ha_falcon.cpp
  storage/falcon/ha_falcon.h
  support-files/build-tags
  mysql-test/suite/falcon/r/falcon_bug_23962.result
  mysql-test/suite/falcon/r/falcon_bug_37080.result
  mysql-test/suite/falcon/t/falcon_bug_23962.test
  mysql-test/suite/falcon/t/falcon_bug_37080.test

=== modified file 'sql/transaction.cc'
--- a/sql/transaction.cc	2008-08-08 19:58:37 +0000
+++ b/sql/transaction.cc	2008-08-12 22:30:55 +0000
@@ -18,8 +18,8 @@
 #pragma implementation                         // gcc: Class implementation
 #endif
 
-#include "mysql_priv.h"
 #include "transaction.h"
+#include "mysql_priv.h"
 
 #ifdef WITH_MARIA_STORAGE_ENGINE
 #include "../storage/maria/ha_maria.h"

=== modified file 'sql/transaction.h'
--- a/sql/transaction.h	2008-08-08 19:58:37 +0000
+++ b/sql/transaction.h	2008-08-12 22:30:55 +0000
@@ -20,6 +20,9 @@
 #ifndef TRANSACTION_H
 #define TRANSACTION_H
 
+#include <my_global.h>
+#include <m_string.h>
+
 class THD;
 
 bool trans_begin(THD *thd, uint flags= 0);