Commit ab71a9e0 authored by unknown's avatar unknown

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

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


sql/mysqld.cc:
  Auto merged
parents fe05ec29 47ecc444
...@@ -60,7 +60,7 @@ client_settings.h: ...@@ -60,7 +60,7 @@ client_settings.h:
libexec_PROGRAMS= mysqlmanager libexec_PROGRAMS= mysqlmanager
mysqlmanager_CXXFLAGS= -Wall -W mysqlmanager_CXXFLAGS=
mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \
manager.h manager.cc log.h log.cc \ manager.h manager.cc log.h log.cc \
......
...@@ -331,9 +331,6 @@ void THD::init(void) ...@@ -331,9 +331,6 @@ void THD::init(void)
variables.date_format); variables.date_format);
variables.datetime_format= date_time_format_copy((THD*) 0, variables.datetime_format= date_time_format_copy((THD*) 0,
variables.datetime_format); variables.datetime_format);
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
variables.ndb_use_transactions= 1;
#endif
pthread_mutex_unlock(&LOCK_global_system_variables); pthread_mutex_unlock(&LOCK_global_system_variables);
server_status= SERVER_STATUS_AUTOCOMMIT; server_status= SERVER_STATUS_AUTOCOMMIT;
if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment