diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2007-01-03 15:32:29 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-01-03 15:32:29 +0100 |
| commit | 87e69474b9f22a32f6814a66ec9652e51931bbc4 (patch) | |
| tree | 730db7e1477ec8086283da9f887d09267f4ff810 /sql | |
| parent | dfa3c87874313a6291b4accfdf0b394d5cc37f39 (diff) | |
| parent | 6385ab6851171129cd1613b9a33968c196f1af00 (diff) | |
| download | mariadb-git-87e69474b9f22a32f6814a66ec9652e51931bbc4.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql')
| -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 b89ab90fc8f..c91ecdf2402 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) |