Commit 3ef38a37 authored by unknown's avatar unknown
Browse files

moved ndb_use_transactions out of opts and to be set default true in THD::init

parent f7164c73

sql/mysqld.cc

+0 −6
Original line number Diff line number Diff line
@@ -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,

sql/sql_class.cc

+3 −0
Original line number Diff line number Diff line
@@ -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;