diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-18 22:45:48 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-18 22:45:48 +0000 |
| commit | 3ef38a3732a832f91d1ab5db62659a36a081646e (patch) | |
| tree | 04327495b470d2cb0ee9c42b7025287007034847 /sql | |
| parent | f7164c732b86fff6c5f5ffb6defc42307e24a3e1 (diff) | |
| download | mariadb-git-3ef38a3732a832f91d1ab5db62659a36a081646e.tar.gz | |
moved ndb_use_transactions out of opts and to be set default true in THD::init
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 6 | ||||
| -rw-r--r-- | sql/sql_class.cc | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5ee52326276..5033c42ac69 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3950,7 +3950,6 @@ enum options_mysqld OPT_INNODB, OPT_ISAM, OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, OPT_NDB_USE_EXACT_COUNT, OPT_NDB_FORCE_SEND, OPT_NDB_AUTOINCREMENT_PREFETCH_SZ, - OPT_NDB_USE_TRANSACTIONS, OPT_SKIP_SAFEMALLOC, OPT_TEMP_POOL, OPT_TX_ISOLATION, OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINKS, @@ -4410,11 +4409,6 @@ Disable with --skip-ndbcluster (will save memory).", (gptr*) &global_system_variables.ndb_use_exact_count, (gptr*) &global_system_variables.ndb_use_exact_count, 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0}, - {"ndb_use_transactions", OPT_NDB_USE_TRANSACTIONS, - "Use transactions in ndb", - (gptr*) &global_system_variables.ndb_use_transactions, - (gptr*) &global_system_variables.ndb_use_transactions, - 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0}, #endif {"new", 'n', "Use very new possible 'unsafe' functions.", (gptr*) &global_system_variables.new_mode, diff --git a/sql/sql_class.cc b/sql/sql_class.cc index eda60b5cfdb..bab81d785c3 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -280,6 +280,9 @@ void THD::init(void) variables.date_format); variables.datetime_format= date_time_format_copy((THD*) 0, variables.datetime_format); +#ifdef HAVE_NDBCLUSTER_DB + variables.ndb_use_transactions= 1; +#endif pthread_mutex_unlock(&LOCK_global_system_variables); server_status= SERVER_STATUS_AUTOCOMMIT; options= thd_startup_options; |