database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

bzr merge -rtag:mariadb-5.5.38 maria/5.5

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-06-10 16:04:26 -04:00
parent d3b2e780d6 6d75570e99
commit b441c510a7
637 changed files with 97556 additions and 88318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_plugin.cc
View File

@@ -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
*/