diff options
| author | unknown <serg@serg.mylan> | 2005-03-14 14:47:51 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-14 14:47:51 +0100 |
| commit | ebbee9d974a37ce9fad0a2b67152cbc412a58067 (patch) | |
| tree | f9212bc6a4dc14f47bfce79ca07320ec3d810728 /sql/mysqld.cc | |
| parent | 1c234737515106342180daa9671de15dedd48fcc (diff) | |
| parent | 87b40f2013a108ed3caaf6912772354d0b0dc842 (diff) | |
| download | mariadb-git-ebbee9d974a37ce9fad0a2b67152cbc412a58067.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/join_outer.result:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5c96de1d73a..c55700b4495 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4216,6 +4216,7 @@ enum options_mysqld OPT_INNODB_STATUS_FILE, OPT_INNODB_MAX_DIRTY_PAGES_PCT, OPT_INNODB_TABLE_LOCKS, + OPT_INNODB_SUPPORT_XA, OPT_INNODB_OPEN_FILES, OPT_INNODB_AUTOEXTEND_INCREMENT, OPT_INNODB_SYNC_SPIN_LOOPS, @@ -4519,6 +4520,11 @@ Disable with --skip-innodb-doublewrite.", (gptr*) &innobase_use_doublewrite, (gptr*) &global_system_variables.innodb_table_locks, (gptr*) &global_system_variables.innodb_table_locks, 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0}, + {"innodb_support_xa", OPT_INNODB_SUPPORT_XA, + "Enable InnoDB support for the XA two-phase commit", + (gptr*) &global_system_variables.innodb_support_xa, + (gptr*) &global_system_variables.innodb_support_xa, + 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0}, #endif /* End HAVE_INNOBASE_DB */ {"isam", OPT_ISAM, "Enable ISAM (if this version of MySQL supports it). \ Disable with --skip-isam.", |