summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-02 16:58:15 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-02 16:58:15 +0300
commitc2fe19883e624ddd0e37768f860fa0853848adb3 (patch)
tree0aec0b83266060d9cc4c9c65ee047b5fd7a83d96 /libmysqld
parent3147bdd0ac34a5c62158b8c28da6ca77e0901f08 (diff)
parentece5ad57e9b2505732be4b043440d9e5a5dc3b9a (diff)
downloadmariadb-git-c2fe19883e624ddd0e37768f860fa0853848adb3.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
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/libmysqld.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index d7f98f8b32b..ecfad75b12f 100644
--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -104,3 +104,4 @@ EXPORTS
mysql_stmt_attr_get
mysql_stmt_attr_set
mysql_stmt_field_count
+ mysql_stmt_next_result