diff options
| author | unknown <thek@kpdesk.mysql.com> | 2007-02-19 16:13:13 +0100 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2007-02-19 16:13:13 +0100 |
| commit | 0d6e497912eb36aab18c125a9636aa9ea33ee408 (patch) | |
| tree | 8b630756dc8e98fad5dd453ccb99d43ee82f6463 /sql/sql_class.cc | |
| parent | f2f1e4d8526fc2a04a5ed37b9a251912c1a091cb (diff) | |
| parent | b40e3eaecf48c8faa7a4e717f3362cec1c3e910a (diff) | |
| download | mariadb-git-0d6e497912eb36aab18c125a9636aa9ea33ee408.tar.gz | |
Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d5f81168be3..8dbf9375634 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -357,6 +357,7 @@ void THD::init(void) void THD::init_for_queries() { + set_time(); ha_enable_transaction(this,TRUE); reset_root_defaults(mem_root, variables.query_alloc_block_size, |