Commit 47ecc444 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  SCCS merged
parents f20cb8d0 6385ab68

sql/mysqld.cc

+13 −2
Original line number Diff line number Diff line
@@ -4739,8 +4739,8 @@ enum options_mysqld 
  OPT_LOG_BIN_TRUST_FUNCTION_CREATORS,

  OPT_SAFE_SHOW_DB, OPT_INNODB_SAFE_BINLOG,

  OPT_INNODB, OPT_ISAM,

  OPT_ENGINE_CONDITION_PUSHDOWN,

  OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, OPT_NDB_USE_EXACT_COUNT,

  OPT_ENGINE_CONDITION_PUSHDOWN, OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, 

  OPT_NDB_USE_EXACT_COUNT, OPT_NDB_USE_TRANSACTIONS,

  OPT_NDB_FORCE_SEND, OPT_NDB_AUTOINCREMENT_PREFETCH_SZ,

  OPT_NDB_SHM, OPT_NDB_OPTIMIZED_NODE_SELECTION, OPT_NDB_CACHE_CHECK_TIME,

  OPT_NDB_MGMD, OPT_NDB_NODEID,
@@ -5436,6 +5436,17 @@ 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 for large inserts, if enabled then large "

   "inserts will be split into several smaller transactions",

   (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},

  {"ndb_use_transactions", OPT_NDB_USE_TRANSACTIONS,

   "same as --ndb-use-transactions.",

   (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},

  {"ndb-shm", OPT_NDB_SHM,

   "Use shared memory connections when available.",

   (gptr*) &opt_ndb_shm,

sql/sql_class.cc

+0 −3
Original line number Diff line number Diff line
@@ -331,9 +331,6 @@ void THD::init(void) 
					       variables.date_format);

  variables.datetime_format= date_time_format_copy((THD*) 0,

						   variables.datetime_format);

#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE

  variables.ndb_use_transactions= 1;

#endif

  pthread_mutex_unlock(&LOCK_global_system_variables);

  server_status= SERVER_STATUS_AUTOCOMMIT;

  if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)