diff options
| author | unknown <mskold/marty@linux.site> | 2007-01-03 15:11:47 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-01-03 15:11:47 +0100 |
| commit | 47ecc4449a746519f05534289439d60210e18cff (patch) | |
| tree | ccfb08dfcbe91f1926e099dd0493752a602ba2e8 /sql/sql_class.cc | |
| parent | f20cb8d0379264eef566c6b91fe2aa03017789ba (diff) | |
| parent | 6385ab6851171129cd1613b9a33968c196f1af00 (diff) | |
| download | mariadb-git-47ecc4449a746519f05534289439d60210e18cff.tar.gz | |
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
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 af66fd2d3de..3d9bc99386e 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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) |