bk commit into 6.0 tree (jas:1.2722)

[Jim Starkey]

Below is the list of changes that have just been committed into a local
6.0 repository of jas. When jas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-02 16:10:06-05:00, jas@stripped +2 -0
  Update test result with Ann's new switch

  mysql-test/suite/falcon/r/falcon_options.result@stripped, 2007-12-02 16:10:03-05:00, jas@stripped +2 -2
    Update test result with Ann's new switch

  mysql-test/suite/falcon/r/falcon_options2.result@stripped, 2007-12-02 16:10:03-05:00, jas@stripped +1 -1
    Update test result with Ann's new switch

diff -Nrup a/mysql-test/suite/falcon/r/falcon_options.result b/mysql-test/suite/falcon/r/falcon_options.result
--- a/mysql-test/suite/falcon/r/falcon_options.result	2007-11-29 19:49:56 -05:00
+++ b/mysql-test/suite/falcon/r/falcon_options.result	2007-12-02 16:10:03 -05:00
@@ -24,7 +24,7 @@ falcon_serial_log_block_size	0
 falcon_serial_log_buffers	20
 falcon_serial_log_dir	
 falcon_serial_log_priority	1
-falcon_two_phase_commit	OFF
+falcon_support_xa	OFF
 falcon_use_deferred_index_hash	OFF
 SELECT @@GLOBAL.falcon_debug_server;
 @@GLOBAL.falcon_debug_server
@@ -99,5 +99,5 @@ FALCON_SERIAL_LOG_BLOCK_SIZE	0
 FALCON_SERIAL_LOG_BUFFERS	20
 FALCON_SERIAL_LOG_DIR	
 FALCON_SERIAL_LOG_PRIORITY	1
-FALCON_TWO_PHASE_COMMIT	OFF
+FALCON_SUPPORT_XA	OFF
 FALCON_USE_DEFERRED_INDEX_HASH	OFF
diff -Nrup a/mysql-test/suite/falcon/r/falcon_options2.result b/mysql-test/suite/falcon/r/falcon_options2.result
--- a/mysql-test/suite/falcon/r/falcon_options2.result	2007-11-29 19:49:56 -05:00
+++ b/mysql-test/suite/falcon/r/falcon_options2.result	2007-12-02 16:10:03 -05:00
@@ -25,7 +25,7 @@ FALCON_SERIAL_LOG_BLOCK_SIZE	0
 FALCON_SERIAL_LOG_BUFFERS	20
 FALCON_SERIAL_LOG_DIR	
 FALCON_SERIAL_LOG_PRIORITY	1
-FALCON_TWO_PHASE_COMMIT	OFF
+FALCON_SUPPORT_XA	OFF
 FALCON_USE_DEFERRED_INDEX_HASH	OFF
 SELECT @@falcon_checkpoint_schedule;
 @@falcon_checkpoint_schedule