diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-30 18:07:40 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-30 18:07:40 +0400 |
| commit | f0fe6e4dac44c9555de1193990e9d2cbc77be62e (patch) | |
| tree | 0a5202757c09044f2c476f93621c75c9df31e32d /sql/sql_class.h | |
| parent | b7ed981f3793b4464b99c98b7baa3c511b52b6a5 (diff) | |
| parent | 9ab0759ea4534c1581dfb62f2f7e3a6e06d3c3c3 (diff) | |
| download | mariadb-git-f0fe6e4dac44c9555de1193990e9d2cbc77be62e.tar.gz | |
Auto-merge from mysql-5.5-merge.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index c9d62c1fa01..e86e42dc094 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1501,7 +1501,7 @@ public: // track down slow pthread_create ulonglong prior_thr_create_utime, thr_create_utime; ulonglong start_utime, utime_after_lock; - + thr_lock_type update_lock_default; Delayed_insert *di; |