diff options
author | unknown <mskold/marty@mysql.com/linux.site> | 2007-01-05 09:26:57 +0100 |
---|---|---|
committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-01-05 09:26:57 +0100 |
commit | 03f609cc3572a622ea71e70450b5ddbb67dd4b9b (patch) | |
tree | bb21648630b8023910746b4afa4f8efcb2ba85ea /sql/sql_class.cc | |
parent | 2e99ee900ac48cfb406f88b9418bfd99a55d3f55 (diff) | |
parent | 87e69474b9f22a32f6814a66ec9652e51931bbc4 (diff) | |
download | mariadb-git-03f609cc3572a622ea71e70450b5ddbb67dd4b9b.tar.gz |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 84d2ce77014..b1f8ec31081 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -290,9 +290,6 @@ 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; if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) |