bzr push into mysql-6.0-falcon branch (hky:2685 to 2686)

[Hakan Kuecuekyilmaz]

 2686 Hakan Kuecuekyilmaz	2008-09-18
      Whitespace only.
modified:
  storage/falcon/BDB.cpp

 2685 Hakan Kuecuekyilmaz	2008-09-16 [merge]
      Merge.
added:
  mysql-test/r/test_wl4435.result
  sql/records.h
  sql/transaction.cc
  sql/transaction.h
modified:
  .bzr-mysql/default.conf
  .bzrignore
  client/Makefile.am
  include/mysql.h
  include/mysql.h.pp
  include/mysql_com.h
  libmysql/client_settings.h
  libmysql/libmysql.c
  libmysql/libmysql.def
  libmysqld/CMakeLists.txt
  libmysqld/Makefile.am
  libmysqld/lib_sql.cc
  libmysqld/libmysqld.def
  mysql-test/r/events_bugs.result
  mysql-test/r/ps.result
  mysql-test/suite/falcon/r/falcon_bug_34164.result
  mysql-test/t/events_bugs.test
  mysql-test/t/ps.test
  sql/CMakeLists.txt
  sql/Makefile.am
  sql/backup/backup_test.cc
  sql/backup/be_snapshot.cc
  sql/backup/kernel.cc
  sql/events.cc
  sql/field.cc
  sql/field.h
  sql/handler.cc
  sql/handler.h
  sql/item.cc
  sql/item.h
  sql/lock.cc
  sql/log_event.cc
  sql/log_event_old.cc
  sql/mysql_priv.h
  sql/procedure.h
  sql/protocol.cc
  sql/protocol.h
  sql/records.cc
  sql/repl_failsafe.cc
  sql/rpl_injector.cc
  sql/rpl_injector.h
  sql/rpl_rli.cc
  sql/rpl_tblmap.cc
  sql/rpl_tblmap.h
  sql/set_var.cc
  sql/slave.cc
  sql/sp_head.cc
  sql/sql_acl.cc
  sql/sql_base.cc
  sql/sql_cache.h
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_cursor.cc
  sql/sql_do.cc
  sql/sql_error.cc
  sql/sql_handler.cc
  sql/sql_help.cc
  sql/sql_insert.cc
  sql/sql_lex.cc
  sql/sql_lex.h
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_prepare.cc
  sql/sql_profile.cc
  sql/sql_repl.cc
  sql/sql_select.cc
  sql/sql_select.h
  sql/sql_show.cc
  sql/sql_table.cc
  sql/sql_yacc.yy
  sql/structs.h
  sql/table.cc
  sql/table.h
  storage/falcon/InfoTable.h
  storage/falcon/ha_falcon.cpp
  storage/falcon/ha_falcon.h
  storage/innobase/handler/ha_innodb.cc
  storage/maria/ha_maria.cc
  tests/mysql_client_test.c

=== modified file 'storage/falcon/BDB.cpp'
--- a/storage/falcon/BDB.cpp	2008-09-04 14:49:10 +0000
+++ b/storage/falcon/BDB.cpp	2008-09-18 16:41:34 +0000
@@ -135,7 +135,7 @@ void Bdb::release()
 	if (cache->panicShutdown)
 		{
 		Thread *thread = Thread::getThread("Cache::fetchPage");
-		
+
 		if (thread->pageMarks == 0)
 			throw SQLError(RUNTIME_ERROR, "Emergency shut is underway");
 		}