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/set_var.cc | |
| 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/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 5509e1dfc61..c0960df8a4c 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -3553,7 +3553,7 @@ sys_var *intern_find_sys_var(const char *str, uint length, bool no_error) A lock on LOCK_system_variable_hash should be held */ var= (sys_var*) my_hash_search(&system_variable_hash, - (uchar*) str, length ? length : strlen(str)); + (uchar*) str, length ? length : strlen(str)); if (!(var || no_error)) my_error(ER_UNKNOWN_SYSTEM_VARIABLE, MYF(0), (char*) str); |