diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 16:58:15 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 16:58:15 +0300 |
| commit | a6daa9ada052b7b7b09683ea6d565c92f5e15512 (patch) | |
| tree | 0aec0b83266060d9cc4c9c65ee047b5fd7a83d96 /sql/mysql_priv.h | |
| parent | c6c1ddabaf2d41b362921524d617fbc772c1c9b6 (diff) | |
| parent | c3eabe01fc30ee38f64b17fabfd58c6328751660 (diff) | |
| download | mariadb-git-a6daa9ada052b7b7b09683ea6d565c92f5e15512.tar.gz | |
Merge next-mr -> next-4284.
Fix Bug#50555 "handler commands crash server in my_hash_first()"
as a post-merge fix (the new handler tests are not passing
otherwise).
- in hash.c, don't call calc_hash if ! my_hash_inited().
- add tests and results for the test case for Bug#50555
mysys/hash.c:
Assert that the hash is initialized when it's used.
sql/set_var.cc:
Check that the hash is initalized before using it (Bug#50555)
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index a926af0370c..69c7a39afe8 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1932,6 +1932,7 @@ extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN]; extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file; extern char default_logfile_name[FN_REFLEN]; extern char log_error_file[FN_REFLEN], *opt_tc_log_file; +extern const double log_10[309]; extern ulonglong log_10_int[20]; extern ulonglong keybuff_size; extern ulonglong thd_startup_options; |