diff options
| author | unknown <andrey@example.com> | 2006-10-19 11:39:19 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-10-19 11:39:19 +0200 |
| commit | 04c8b8d15c17c2cd0268659c870b1ec078eaf046 (patch) | |
| tree | d0955d7817e91ce74a4f9cb9d76eb6c4ff46d102 | |
| parent | 016a7d4c636de66246f443eade4a76ac75b52173 (diff) | |
| parent | ca817b49cf00eebfb95e7765714a1a0db8913433 (diff) | |
| download | mariadb-git-04c8b8d15c17c2cd0268659c870b1ec078eaf046.tar.gz | |
Merge example.com:/work/bug23379/my41-bug23379
into example.com:/work/bug23379/my50-bug23379
sql/sql_class.cc:
Auto merged
| -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 093173ab949..23c5a66307b 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -205,6 +205,7 @@ THD::THD() // Must be reset to handle error with THD's created for init of mysqld lex->current_select= 0; start_time=(time_t) 0; + time_after_lock=(time_t) 0; current_linfo = 0; slave_thread = 0; variables.pseudo_thread_id= 0; |