bzr push into mysql-6.0-falcon branch (lars-erik.bjork:2724)

[lars-erik.bjork]

 2724 lars-erik.bjork@stripped	2008-07-04 [merge]
      Merging ...
removed:
  dbug/.cvsignore
  dbug/doinstall.sh
  dbug/install.sh
  dbug/mklintlib.sh
  dbug/qmake.cmd
  dbug/vargs.h
  include/atomic/generic-msvc.h
  include/lf.h
  mysys/lf_alloc-pin.c
  mysys/lf_dynarray.c
  mysys/lf_hash.c
added:
  BUILD/compile-amd64-gprof-no-ndb
  dbug/remove_function_from_trace.pl
  dbug/tests-t.pl
  dbug/tests.c
  include/atomic/generic-msvc.h
  include/lf.h
  include/maria.h
  include/myisamchk.h
  include/wqueue.h
  mysql-test/include/have_maria.inc
  mysql-test/include/maria_empty_logs.inc
  mysql-test/include/maria_make_snapshot.inc
  mysql-test/include/maria_make_snapshot_for_comparison.inc
  mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
  mysql-test/include/maria_verify_recovery.inc
  mysql-test/r/maria-big.result
  mysql-test/r/maria-connect.result
  mysql-test/r/maria-gis-rtree-dynamic.result
  mysql-test/r/maria-gis-rtree-trans.result
  mysql-test/r/maria-gis-rtree.result
  mysql-test/r/maria-mvcc.result
  mysql-test/r/maria-no-logging.result
  mysql-test/r/maria-page-checksum.result
  mysql-test/r/maria-preload.result
  mysql-test/r/maria-purge.result
  mysql-test/r/maria-recover.result
  mysql-test/r/maria-recovery-big.result
  mysql-test/r/maria-recovery-bitmap.result
  mysql-test/r/maria-recovery-rtree-ft.result
  mysql-test/r/maria-recovery.result
  mysql-test/r/maria-recovery2.result
  mysql-test/r/maria.result
  mysql-test/r/maria2.result
  mysql-test/r/maria3.result
  mysql-test/r/maria_notembedded.result
  mysql-test/r/old-mode.result
  mysql-test/r/ps_maria.result
  mysql-test/r/row-checksum-old.result
  mysql-test/r/row-checksum.result
  mysql-test/suite/rpl/r/rpl_stm_maria.result
  mysql-test/suite/rpl/t/rpl_stm_maria.test
  mysql-test/t/maria-big.test
  mysql-test/t/maria-connect.test
  mysql-test/t/maria-gis-rtree-dynamic.test
  mysql-test/t/maria-gis-rtree-trans.test
  mysql-test/t/maria-gis-rtree.test
  mysql-test/t/maria-mvcc.test
  mysql-test/t/maria-no-logging.test
  mysql-test/t/maria-page-checksum.test
  mysql-test/t/maria-preload.test
  mysql-test/t/maria-purge.test
  mysql-test/t/maria-recover-master.opt
  mysql-test/t/maria-recover.test
  mysql-test/t/maria-recovery-big-master.opt
  mysql-test/t/maria-recovery-big.test
  mysql-test/t/maria-recovery-bitmap-master.opt
  mysql-test/t/maria-recovery-bitmap.test
  mysql-test/t/maria-recovery-master.opt
  mysql-test/t/maria-recovery-rtree-ft-master.opt
  mysql-test/t/maria-recovery-rtree-ft.test
  mysql-test/t/maria-recovery.test
  mysql-test/t/maria-recovery2-master.opt
  mysql-test/t/maria-recovery2.test
  mysql-test/t/maria.test
  mysql-test/t/maria2.test
  mysql-test/t/maria3.test
  mysql-test/t/maria_notembedded.test
  mysql-test/t/old-mode-master.opt
  mysql-test/t/old-mode.test
  mysql-test/t/ps_maria.test
  mysql-test/t/row-checksum-old-master.opt
  mysql-test/t/row-checksum-old.test
  mysql-test/t/row-checksum.test
  mysql-test/t/sync_frm_basic-master.opt
  mysys/lf_alloc-pin.c
  mysys/lf_dynarray.c
  mysys/lf_hash.c
  mysys/my_chmod.c
  mysys/my_rnd.c
  mysys/my_safehash.c
  mysys/my_safehash.h
  mysys/my_uuid.c
  mysys/wqueue.c
  sql-bench/myisam.cnf
  storage/maria/
  storage/maria/CMakeLists.txt
  storage/maria/KNOWN_BUGS.txt
  storage/maria/Makefile.am
  storage/maria/file_formats.txt
  storage/maria/ft_maria.c
  storage/maria/ha_maria.cc
  storage/maria/ha_maria.h
  storage/maria/lockman.c
  storage/maria/lockman.h
  storage/maria/ma_bitmap.c
  storage/maria/ma_blockrec.c
  storage/maria/ma_blockrec.h
  storage/maria/ma_cache.c
  storage/maria/ma_changed.c
  storage/maria/ma_check.c
  storage/maria/ma_check_standalone.h
  storage/maria/ma_checkpoint.c
  storage/maria/ma_checkpoint.h
  storage/maria/ma_checksum.c
  storage/maria/ma_close.c
  storage/maria/ma_commit.c
  storage/maria/ma_commit.h
  storage/maria/ma_control_file.c
  storage/maria/ma_control_file.h
  storage/maria/ma_create.c
  storage/maria/ma_dbug.c
  storage/maria/ma_delete.c
  storage/maria/ma_delete_all.c
  storage/maria/ma_delete_table.c
  storage/maria/ma_dynrec.c
  storage/maria/ma_extra.c
  storage/maria/ma_ft_boolean_search.c
  storage/maria/ma_ft_eval.c
  storage/maria/ma_ft_eval.h
  storage/maria/ma_ft_nlq_search.c
  storage/maria/ma_ft_parser.c
  storage/maria/ma_ft_stem.c
  storage/maria/ma_ft_test1.c
  storage/maria/ma_ft_test1.h
  storage/maria/ma_ft_update.c
  storage/maria/ma_ftdefs.h
  storage/maria/ma_fulltext.h
  storage/maria/ma_info.c
  storage/maria/ma_init.c
  storage/maria/ma_key.c
  storage/maria/ma_key_recover.c
  storage/maria/ma_key_recover.h
  storage/maria/ma_keycache.c
  storage/maria/ma_locking.c
  storage/maria/ma_loghandler.c
  storage/maria/ma_loghandler.h
  storage/maria/ma_loghandler_lsn.h
  storage/maria/ma_open.c
  storage/maria/ma_packrec.c
  storage/maria/ma_page.c
  storage/maria/ma_pagecache.c
  storage/maria/ma_pagecache.h
  storage/maria/ma_pagecaches.c
  storage/maria/ma_pagecrc.c
  storage/maria/ma_panic.c
  storage/maria/ma_preload.c
  storage/maria/ma_range.c
  storage/maria/ma_recovery.c
  storage/maria/ma_recovery.h
  storage/maria/ma_recovery_util.c
  storage/maria/ma_recovery_util.h
  storage/maria/ma_rename.c
  storage/maria/ma_rfirst.c
  storage/maria/ma_rkey.c
  storage/maria/ma_rlast.c
  storage/maria/ma_rnext.c
  storage/maria/ma_rnext_same.c
  storage/maria/ma_rprev.c
  storage/maria/ma_rrnd.c
  storage/maria/ma_rsame.c
  storage/maria/ma_rsamepos.c
  storage/maria/ma_rt_index.c
  storage/maria/ma_rt_index.h
  storage/maria/ma_rt_key.c
  storage/maria/ma_rt_key.h
  storage/maria/ma_rt_mbr.c
  storage/maria/ma_rt_mbr.h
  storage/maria/ma_rt_split.c
  storage/maria/ma_rt_test.c
  storage/maria/ma_scan.c
  storage/maria/ma_search.c
  storage/maria/ma_sort.c
  storage/maria/ma_sp_defs.h
  storage/maria/ma_sp_key.c
  storage/maria/ma_sp_test.c
  storage/maria/ma_state.c
  storage/maria/ma_state.h
  storage/maria/ma_static.c
  storage/maria/ma_statrec.c
  storage/maria/ma_test1.c
  storage/maria/ma_test2.c
  storage/maria/ma_test3.c
  storage/maria/ma_test_all.res
  storage/maria/ma_test_all.sh
  storage/maria/ma_test_big.sh
  storage/maria/ma_test_force_start.pl
  storage/maria/ma_test_recovery
  storage/maria/ma_unique.c
  storage/maria/ma_update.c
  storage/maria/ma_write.c
  storage/maria/maria_chk.c
  storage/maria/maria_def.h
  storage/maria/maria_ftdump.c
  storage/maria/maria_pack.c
  storage/maria/maria_read_log.c
  storage/maria/maria_rename.sh
  storage/maria/plug.in
  storage/maria/tablockman.c
  storage/maria/tablockman.h
  storage/maria/test_pack
  storage/maria/trnman.c
  storage/maria/trnman.h
  storage/maria/trnman_public.h
  storage/maria/unittest/
  storage/maria/unittest/CMakeLists.txt
  storage/maria/unittest/Makefile.am
  storage/maria/unittest/lockman-t.c
  storage/maria/unittest/lockman1-t.c
  storage/maria/unittest/lockman2-t.c
  storage/maria/unittest/ma_control_file-t.c
  storage/maria/unittest/ma_loghandler_examples.c
  storage/maria/unittest/ma_maria_log_cleanup.c
  storage/maria/unittest/ma_pagecache_consist.c
  storage/maria/unittest/ma_pagecache_rwconsist.c
  storage/maria/unittest/ma_pagecache_single.c
  storage/maria/unittest/ma_test_all-t
  storage/maria/unittest/ma_test_loghandler-t.c
  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
  storage/maria/unittest/ma_test_loghandler_multigroup-t.c
  storage/maria/unittest/ma_test_loghandler_multithread-t.c
  storage/maria/unittest/ma_test_loghandler_noflush-t.c
  storage/maria/unittest/ma_test_loghandler_nologs-t.c
  storage/maria/unittest/ma_test_loghandler_pagecache-t.c
  storage/maria/unittest/ma_test_loghandler_purge-t.c
  storage/maria/unittest/ma_test_recovery.expected
  storage/maria/unittest/ma_test_recovery.pl
  storage/maria/unittest/sequence_storage.c
  storage/maria/unittest/sequence_storage.h
  storage/maria/unittest/test_file.c
  storage/maria/unittest/test_file.h
  storage/maria/unittest/trnman-t.c
  storage/myisam/ft_myisam.c
renamed:
  mysql-test/suite/falcon/r/falcon_bug_23189.result =>
mysql-test/suite/falcon_team/r/falcon_bug_23189.result
  mysql-test/suite/falcon/r/falcon_bug_37080.result =>
mysql-test/suite/falcon_team/r/falcon_bug_37080.result
  mysql-test/suite/falcon/t/falcon_bug_23189.test =>
mysql-test/suite/falcon_team/t/falcon_bug_23189.test
  mysql-test/suite/falcon/t/falcon_bug_37080.test =>
mysql-test/suite/falcon_team/t/falcon_bug_37080.test
  mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result =>
mysql-test/suite/funcs_1/r/is_collation_charset_applic.result
  mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test =>
mysql-test/suite/funcs_1/t/is_collation_charset_applic.test
  mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result =>
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt =>
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test =>
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
modified:
  .bzr-mysql/default.conf
  .bzrignore
  BUILD/SETUP.sh
  BUILD/compile-dist
  BitKeeper/triggers/post-commit
  BitKeeper/triggers/pre-delta
  CMakeLists.txt
  Makefile.am
  client/get_password.c
  client/mysqladmin.cc
  client/mysqltest.c
  cmd-line-utils/readline/bind.c
  cmd-line-utils/readline/chardefs.h
  cmd-line-utils/readline/display.c
  cmd-line-utils/readline/histexpand.c
  cmd-line-utils/readline/history.c
  cmd-line-utils/readline/readline.c
  cmd-line-utils/readline/text.c
  config/ac-macros/plugins.m4
  configure.in
  dbug/CMakeLists.txt*
  dbug/Makefile.am
  dbug/dbug.c
  dbug/dbug_add_tags.pl
  dbug/user.r
  extra/Makefile.am
  extra/replace.c
  include/Makefile.am
  include/atomic/gcc_builtins.h
  include/atomic/rwlock.h
  include/config-win.h
  include/ft_global.h
  include/keycache.h
  include/m_string.h
  include/my_alloc.h
  include/my_atomic.h
  include/my_base.h
  include/my_dbug.h
  include/my_global.h
  include/my_handler.h
  include/my_pthread.h
  include/my_sys.h
  include/my_tree.h
  include/myisam.h
  include/myisampack.h
  include/mysql/plugin.h
  include/mysql_com.h
  include/mysys_err.h
  include/thr_lock.h
  libmysql/CMakeLists.txt
  libmysql/Makefile.shared
  libmysql/libmysql.c
  libmysqld/CMakeLists.txt
  mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
  mysql-test/extra/rpl_tests/rpl_insert_delayed.test
  mysql-test/include/ps_conv.inc
  mysql-test/include/varchar.inc
  mysql-test/include/wait_until_connected_again.inc
  mysql-test/install_test_db.sh
  mysql-test/lib/mtr_process.pl
  mysql-test/lib/mtr_report.pl
  mysql-test/mysql-test-run.pl
  mysql-test/r/alter_table.result
  mysql-test/r/change_user.result
  mysql-test/r/create.result
  mysql-test/r/information_schema_parameters.result
  mysql-test/r/information_schema_routines.result
  mysql-test/r/innodb.result
  mysql-test/r/merge.result
  mysql-test/r/mix2_myisam.result
  mysql-test/r/myisam.result
  mysql-test/r/mysqldump.result
  mysql-test/r/ps_2myisam.result
  mysql-test/r/ps_3innodb.result
  mysql-test/r/ps_4heap.result
  mysql-test/r/ps_5merge.result
  mysql-test/r/query_cache.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/variables-big.result
  mysql-test/suite/falcon/r/falcon_bug_22972.result
  mysql-test/suite/funcs_1/datadict/is_routines.inc
  mysql-test/suite/funcs_1/datadict/is_triggers.inc
  mysql-test/suite/funcs_1/datadict/is_views.inc
  mysql-test/suite/funcs_1/datadict/processlist_priv.inc
  mysql-test/suite/funcs_1/datadict/processlist_val.inc
  mysql-test/suite/funcs_1/datadict/tables2.inc
  mysql-test/suite/funcs_1/r/is_columns.result
  mysql-test/suite/funcs_1/r/is_events.result
  mysql-test/suite/funcs_1/r/is_routines.result
  mysql-test/suite/funcs_1/r/is_tables_is.result
  mysql-test/suite/funcs_1/r/is_tables_myisam.result
  mysql-test/suite/funcs_1/r/is_tables_mysql.result
  mysql-test/suite/funcs_1/r/is_tables_ndb.result
  mysql-test/suite/funcs_1/r/is_triggers.result
  mysql-test/suite/funcs_1/r/is_views.result
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
  mysql-test/suite/funcs_1/t/is_columns.test
  mysql-test/suite/funcs_1/t/is_events.test
  mysql-test/suite/ndb/r/ndb_auto_increment.result
  mysql-test/suite/ndb/r/ps_7ndb.result
  mysql-test/suite/ndb/t/ndb_auto_increment.test
  mysql-test/suite/rpl/r/rpl_insert.result
  mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
  mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
  mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
  mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
  mysql-test/suite/rpl/t/rpl_insert.test
  mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
  mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
  mysql-test/t/alter_table.test
  mysql-test/t/change_user.test
  mysql-test/t/crash_commit_before-master.opt
  mysql-test/t/create.test
  mysql-test/t/delayed.test
  mysql-test/t/disabled.def
  mysql-test/t/information_schema_parameters.test
  mysql-test/t/information_schema_routines.test
  mysql-test/t/merge.test
  mysql-test/t/myisam.test
  mysql-test/t/mysqldump.test
  mysql-test/t/query_cache.test
  mysql-test/t/query_cache_debug.test
  mysql-test/t/query_cache_merge.test
  mysql-test/t/subselect.test
  mysql-test/t/variables-big.test
  mysql-test/valgrind.supp
  mysys/CMakeLists.txt
  mysys/Makefile.am
  mysys/array.c
  mysys/checksum.c
  mysys/errors.c
  mysys/hash.c
  mysys/mf_iocache.c
  mysys/mf_iocache2.c
  mysys/mf_keycache.c
  mysys/mf_keycaches.c
  mysys/my_bitmap.c
  mysys/my_compress.c
  mysys/my_error.c
  mysys/my_fopen.c
  mysys/my_getopt.c
  mysys/my_handler.c
  mysys/my_handler_errors.h
  mysys/my_init.c
  mysys/my_lock.c
  mysys/my_pread.c
  mysys/my_read.c
  mysys/my_seek.c
  mysys/my_static.c
  mysys/my_static.h
  mysys/my_sync.c
  mysys/my_thr_init.c
  mysys/my_winthread.c
  mysys/my_write.c
  mysys/safemalloc.c
  mysys/thr_lock.c
  mysys/thr_mutex.c
  plugin/daemon_example/daemon_example.cc
  scripts/Makefile.am
  scripts/mysql_fix_privilege_tables.sh
  sql-bench/example
  sql/CMakeLists.txt
  sql/event_data_objects.cc
  sql/events.cc
  sql/field.cc
  sql/field.h
  sql/filesort.cc
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster.h
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_func.cc
  sql/item_func.h
  sql/item_strfunc.cc
  sql/item_strfunc.h
  sql/item_subselect.cc
  sql/item_xmlfunc.cc
  sql/lex.h
  sql/lock.cc
  sql/log.cc
  sql/log_event.cc
  sql/log_event_old.cc
  sql/my_lock.c
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/opt_sum.cc
  sql/partition_info.cc
  sql/password.c
  sql/protocol.cc
  sql/rpl_filter.cc
  sql/rpl_injector.cc
  sql/rpl_injector.h
  sql/rpl_rli.cc
  sql/set_var.cc
  sql/spatial.cc
  sql/sql_acl.cc
  sql/sql_base.cc
  sql/sql_cache.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_crypt.cc
  sql/sql_crypt.h
  sql/sql_delete.cc
  sql/sql_insert.cc
  sql/sql_load.cc
  sql/sql_parse.cc
  sql/sql_plugin.cc
  sql/sql_repl.cc
  sql/sql_select.cc
  sql/sql_select.h
  sql/sql_show.cc
  sql/sql_sort.h
  sql/sql_table.cc
  sql/sql_tablespace.cc
  sql/sql_union.cc
  sql/sql_update.cc
  sql/sql_yacc.yy
  sql/table.cc
  sql/time.cc
  sql/unireg.cc
  storage/archive/ha_archive.cc
  storage/archive/ha_archive.h
  storage/csv/ha_tina.cc
  storage/csv/ha_tina.h
  storage/falcon/SectorBuffer.cpp
  storage/federated/ha_federated.cc
  storage/federated/ha_federated.h
  storage/heap/hp_write.c
  storage/myisam/CMakeLists.txt
  storage/myisam/Makefile.am
  storage/myisam/ft_boolean_search.c
  storage/myisam/ft_static.c
  storage/myisam/ft_stopwords.c
  storage/myisam/fulltext.h
  storage/myisam/ha_myisam.cc
  storage/myisam/ha_myisam.h
  storage/myisam/mi_cache.c
  storage/myisam/mi_check.c
  storage/myisam/mi_checksum.c
  storage/myisam/mi_close.c
  storage/myisam/mi_create.c
  storage/myisam/mi_dbug.c
  storage/myisam/mi_delete.c
  storage/myisam/mi_dynrec.c
  storage/myisam/mi_extra.c
  storage/myisam/mi_key.c
  storage/myisam/mi_locking.c
  storage/myisam/mi_log.c
  storage/myisam/mi_open.c
  storage/myisam/mi_packrec.c
  storage/myisam/mi_range.c
  storage/myisam/mi_rkey.c
  storage/myisam/mi_search.c
  storage/myisam/mi_test1.c
  storage/myisam/mi_test2.c
  storage/myisam/mi_test3.c
  storage/myisam/mi_update.c
  storage/myisam/mi_write.c
  storage/myisam/myisamchk.c
  storage/myisam/myisamdef.h
  storage/myisam/myisamlog.c
  storage/myisam/myisampack.c
  storage/myisam/plug.in
  storage/myisam/rt_index.c
  storage/myisam/rt_test.c
  storage/myisam/sort.c
  storage/myisammrg/ha_myisammrg.cc
  storage/myisammrg/ha_myisammrg.h
  strings/CMakeLists.txt
  strings/bmove512.c
  strings/ctype.c
  strings/strmake.c
  support-files/compiler_warnings.supp
  support-files/magic
  support-files/mysql.spec.sh
  tests/mysql_client_test.c
  unittest/Makefile.am
  unittest/mysys/Makefile.am
  unittest/mysys/my_atomic-t.c
  unittest/mytap/tap.c
  unittest/mytap/tap.h
  unittest/unit.pl
  win/configure.js
  mysql-test/suite/falcon_team/t/falcon_bug_37080.test
  mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
  mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test

=== modified file 'mysql-test/suite/falcon/r/falcon_options.result'
--- a/mysql-test/suite/falcon/r/falcon_options.result	2008-06-26 13:30:24 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options.result	2008-07-03 11:24:12 +0000
@@ -12,7 +12,6 @@ falcon_initial_allocation	0
 falcon_io_threads	2
 falcon_large_blob_threshold	160000
 falcon_lock_wait_timeout	50
-falcon_max_transaction_backlog	150
 falcon_page_cache_size	4194304
 falcon_page_size	4096
 falcon_record_chill_threshold	5242880
@@ -60,14 +59,6 @@ SET GLOBAL falcon_debug_mask = 4096;
 SELECT @@GLOBAL.falcon_debug_mask;
 @@GLOBAL.falcon_debug_mask
 4096
-SELECT @@GLOBAL.falcon_max_transaction_backlog INTO
@previous_falcon_max_transaction_backlog;
-SELECT @@GLOBAL.falcon_max_transaction_backlog;
-@@GLOBAL.falcon_max_transaction_backlog
-150
-SET GLOBAL falcon_max_transaction_backlog = 10001;
-SELECT @@GLOBAL.falcon_max_transaction_backlog;
-@@GLOBAL.falcon_max_transaction_backlog
-10001
 SELECT @@GLOBAL.falcon_record_memory_max INTO @previous_falcon_record_memory_max;
 SELECT @@GLOBAL.falcon_record_memory_max;
 @@GLOBAL.falcon_record_memory_max
@@ -101,7 +92,6 @@ FALCON_INITIAL_ALLOCATION	0
 FALCON_IO_THREADS	2
 FALCON_LARGE_BLOB_THRESHOLD	160000
 FALCON_LOCK_WAIT_TIMEOUT	50
-FALCON_MAX_TRANSACTION_BACKLOG	10001
 FALCON_PAGE_CACHE_SIZE	4194304
 FALCON_PAGE_SIZE	4096
 FALCON_RECORD_CHILL_THRESHOLD	1073741824
@@ -117,7 +107,6 @@ FALCON_SERIAL_LOG_PRIORITY	1
 FALCON_SUPPORT_XA	OFF
 FALCON_USE_DEFERRED_INDEX_HASH	OFF
 SET GLOBAL falcon_debug_mask = @previous_falcon_debug_mask;
-SET GLOBAL falcon_max_transaction_backlog =  @previous_falcon_max_transaction_backlog;
 SET GLOBAL falcon_record_memory_max =  @previous_falcon_record_memory_max;
 SET GLOBAL falcon_index_chill_threshold = @previous_falcon_index_chill_threshold;
 SET GLOBAL falcon_record_chill_threshold = @previous_falcon_record_chill_threshold;

=== modified file 'mysql-test/suite/falcon/r/falcon_options2.result'
--- a/mysql-test/suite/falcon/r/falcon_options2.result	2008-06-26 13:30:24 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options2.result	2008-07-03 11:24:12 +0000
@@ -13,7 +13,6 @@ FALCON_INITIAL_ALLOCATION	0
 FALCON_IO_THREADS	2
 FALCON_LARGE_BLOB_THRESHOLD	160000
 FALCON_LOCK_WAIT_TIMEOUT	50
-FALCON_MAX_TRANSACTION_BACKLOG	150
 FALCON_PAGE_CACHE_SIZE	4194304
 FALCON_PAGE_SIZE	4096
 FALCON_RECORD_CHILL_THRESHOLD	5242880
@@ -64,9 +63,6 @@ SELECT @@falcon_large_blob_threshold;
 SELECT @@falcon_lock_wait_timeout;
 @@falcon_lock_wait_timeout
 50
-SELECT @@falcon_max_transaction_backlog;
-@@falcon_max_transaction_backlog
-150
 SELECT @@falcon_page_cache_size;
 @@falcon_page_cache_size
 4194304

=== modified file 'mysql-test/suite/falcon/t/falcon_options.test'
--- a/mysql-test/suite/falcon/t/falcon_options.test	2008-06-26 13:30:24 +0000
+++ b/mysql-test/suite/falcon/t/falcon_options.test	2008-07-03 11:24:12 +0000
@@ -32,11 +32,6 @@ SELECT @@GLOBAL.falcon_debug_mask;
 SET GLOBAL falcon_debug_mask = 4096;
 SELECT @@GLOBAL.falcon_debug_mask;
 
-SELECT @@GLOBAL.falcon_max_transaction_backlog INTO
@previous_falcon_max_transaction_backlog;
-SELECT @@GLOBAL.falcon_max_transaction_backlog;
-SET GLOBAL falcon_max_transaction_backlog = 10001;
-SELECT @@GLOBAL.falcon_max_transaction_backlog;
-
 SELECT @@GLOBAL.falcon_record_memory_max INTO @previous_falcon_record_memory_max;
 SELECT @@GLOBAL.falcon_record_memory_max;
 SET GLOBAL falcon_record_memory_max = 536870912;
@@ -58,7 +53,6 @@ SELECT * FROM INFORMATION_SCHEMA.global_
 
 # Final cleanup.
 SET GLOBAL falcon_debug_mask = @previous_falcon_debug_mask;
-SET GLOBAL falcon_max_transaction_backlog =  @previous_falcon_max_transaction_backlog;
 SET GLOBAL falcon_record_memory_max =  @previous_falcon_record_memory_max;
 SET GLOBAL falcon_index_chill_threshold = @previous_falcon_index_chill_threshold;
 SET GLOBAL falcon_record_chill_threshold = @previous_falcon_record_chill_threshold;

=== modified file 'mysql-test/suite/falcon/t/falcon_options2.test'
--- a/mysql-test/suite/falcon/t/falcon_options2.test	2008-03-11 16:15:47 +0000
+++ b/mysql-test/suite/falcon/t/falcon_options2.test	2008-07-03 11:24:12 +0000
@@ -18,7 +18,6 @@ SELECT @@falcon_initial_allocation;
 SELECT @@falcon_io_threads;
 SELECT @@falcon_large_blob_threshold;
 SELECT @@falcon_lock_wait_timeout;
-SELECT @@falcon_max_transaction_backlog;
 SELECT @@falcon_page_cache_size;
 SELECT @@falcon_page_size;
 SELECT @@falcon_record_chill_threshold;

=== modified file 'storage/falcon/Configuration.cpp'
--- a/storage/falcon/Configuration.cpp	2008-06-26 13:30:24 +0000
+++ b/storage/falcon/Configuration.cpp	2008-07-03 11:24:12 +0000
@@ -99,7 +99,7 @@ static const uint64 MIN_PAGE_CACHE			= 2
 static const uint64 MIN_RECORD_MEMORY		= 5000000;
 static const int	MIN_SCAVENGE_THRESHOLD	= 10;
 static const int	MIN_SCAVENGE_FLOOR		= 10;
-static const uint64 MAX_TRANSACTION_BACKLOG	= 10000;
+static const uint64 MAX_TRANSACTION_BACKLOG	= 1000;
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -110,6 +110,7 @@ Configuration::Configuration(const char 
 	checkpointSchedule = "7,37 * * * * *";
 	scavengeSchedule = "15,45 * * * * *";
 	serialLogBlockSize			= falcon_serial_log_block_size;
+	maxTransactionBacklog		        = MAX_TRANSACTION_BACKLOG;
 
 #ifdef STORAGE_ENGINE
 	recordMemoryMax				= falcon_record_memory_max;
@@ -121,7 +122,6 @@ Configuration::Configuration(const char 
 	pageCacheSize				= falcon_page_cache_size;
 	indexChillThreshold			= falcon_index_chill_threshold;
 	recordChillThreshold		= falcon_record_chill_threshold;
-	maxTransactionBacklog		= falcon_max_transaction_backlog;
 	useDeferredIndexHash		= (falcon_use_deferred_index_hash != 0);
 	
 	if (falcon_checkpoint_schedule)
@@ -169,7 +169,6 @@ Configuration::Configuration(const char 
 	pageCacheSize				= getMemorySize(PAGE_CACHE_MEMORY);
 	indexChillThreshold			= 4 * ONE_MB;
 	recordChillThreshold		= 5 * ONE_MB;
-	maxTransactionBacklog		= MAX_TRANSACTION_BACKLOG;
 	falcon_lock_wait_timeout	= 0;
 #endif
 

=== modified file 'storage/falcon/StorageParameters.h'
--- a/storage/falcon/StorageParameters.h	2008-06-26 13:30:24 +0000
+++ b/storage/falcon/StorageParameters.h	2008-07-03 11:24:12 +0000
@@ -21,7 +21,6 @@ PARAMETER_UINT(index_chill_threshold, "B
 PARAMETER_UINT(io_threads, "Number of Falcon I/O threads", 2, 2, 20, 0, NULL)
 PARAMETER_UINT(large_blob_threshold, "Threshold for large blobs", 0, 160000, INT_MAX, 0,
NULL)
 PARAMETER_UINT(lock_wait_timeout, "Transaction lock time period (seconds)", 0, 50,
INT_MAX, 0, NULL)
-PARAMETER_UINT(max_transaction_backlog, "Maximum number of backlogged transactions.", 1,
150, 1000000, 0, NULL)
 PARAMETER_UINT(page_size, "The page size used when creating a Falcon tablespace.", 1024,
4096, 32768, 0x0200, NULL)
 PARAMETER_UINT(record_chill_threshold, "Bytes of pending record data that is 'frozen' to
the Falcon serial log.", 1, 5*1024*1024, 1024*1024*1024, 0,
&updateRecordChillThreshold)
 PARAMETER_UINT(record_scavenge_floor, "A percentage of falcon_record_memory_threshold
that defines the amount of record data that will remain in the record cache after a
scavenge run.", 10, 50, 90, 0x2000, &StorageInterface::updateRecordScavengeFloor)