Skip to content

M
mariadb
Commit da931f9d authored by unknown's avatar unknown
Browse files
Options

Manual merge of the fix for BUG#4285 from 4.1 


sql/sql_show.cc:
  removed sql_key_cache
parent 888ee151
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sql/sql_show.cc
View file @ da931f9d
...@@ -1512,7 +1512,7 @@ static bool show_status_array(THD *thd, const char *wild, ...@@ -1512,7 +1512,7 @@ static bool show_status_array(THD *thd, const char *wild,
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
case SHOW_KEY_CACHE_LONG: case SHOW_KEY_CACHE_LONG:
case SHOW_KEY_CACHE_CONST_LONG: case SHOW_KEY_CACHE_CONST_LONG:
value= (value-(char*) &dflt_key_cache_var)+ (char*) sql_key_cache; value= (value-(char*) &dflt_key_cache_var)+ (char*) dflt_key_cache;
end= int10_to_str(*(long*) value, buff, 10); end= int10_to_str(*(long*) value, buff, 10);
break; break;
case SHOW_UNDEF: // Show never happen case SHOW_UNDEF: // Show never happen
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7