diff options
| author | unknown <timour@mysql.com> | 2005-01-21 16:47:51 +0200 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-01-21 16:47:51 +0200 |
| commit | 7f4324a58d5f8c17a41d31d31e89649c55ee1c35 (patch) | |
| tree | 4ecd810ba3af1003f6966b875354a5cb06c0f600 /sql/sql_show.cc | |
| parent | f813e0dac0d9f31140b699f3903940b50c9481fc (diff) | |
| parent | 8e1e1e73d811d4090255b49128ffa697163b2e1d (diff) | |
| download | mariadb-git-7f4324a58d5f8c17a41d31d31e89649c55ee1c35.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/4.1-bug-4285
into mysql.com:/home/timka/mysql/src/4.1-dbg
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 91cac29f3a3..8d741b4dc67 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2067,7 +2067,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, #endif /* HAVE_OPENSSL */ case SHOW_KEY_CACHE_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); break; case SHOW_UNDEF: // Show never happen |