diff options
| author | igor@rurik.mysql.com <> | 2003-10-01 23:37:05 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2003-10-01 23:37:05 -0700 |
| commit | f17ff0bc39135b417a3a120dbb59d5a9389d8221 (patch) | |
| tree | b01319a4b1ce6d72b1867800eec320e03d3a9acd /sql/set_var.cc | |
| parent | f12cbd4bb8234c8d851bf9e644214760bc59e690 (diff) | |
| download | mariadb-git-f17ff0bc39135b417a3a120dbb59d5a9389d8221.tar.gz | |
Many files:
Fix after manual merge
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index f5f0b400793..df2164258d8 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1597,7 +1597,8 @@ void sys_var_collation_server::set_default(THD *thd, enum_var_type type) static LEX_STRING default_key_cache_base= {(char *) DEFAULT_KEY_CACHE_NAME, 7}; -static KEY_CACHE_VAR zero_key_cache= { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static KEY_CACHE_VAR zero_key_cache= + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; static KEY_CACHE_VAR *get_key_cache(LEX_STRING *cache_name) { |