diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:04:26 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:04:26 -0400 |
| commit | b441c510a7ea731e2da0fa9b4cf3e7f1275f841b (patch) | |
| tree | 7147fc480bff17dc310cb3c03494777ad1878071 /sql/sql_plugin.cc | |
| parent | d3b2e780d6ddee9a4f434ba9928f77127bbbeeb1 (diff) | |
| parent | 6d75570e99fbf070cdbeefdfbcfc94d1c7b3ad1f (diff) | |
| download | mariadb-git-b441c510a7ea731e2da0fa9b4cf3e7f1275f841b.tar.gz | |
bzr merge -rtag:mariadb-5.5.38 maria/5.5
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 60e7b0b0d44..c5e324ee9dc 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -2900,11 +2900,12 @@ static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock) DBUG_ENTER("intern_sys_var_ptr"); DBUG_ASSERT(offset >= 0); DBUG_ASSERT((uint)offset <= global_system_variables.dynamic_variables_head); - mysql_mutex_assert_not_owner(&LOCK_open); if (!thd) DBUG_RETURN((uchar*) global_system_variables.dynamic_variables_ptr + offset); + mysql_mutex_assert_not_owner(&LOCK_open); + /* dynamic_variables_head points to the largest valid offset */ |