summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2009-02-24 15:29:49 +0400
committerAlexey Botchkov <holyfoot@mysql.com>2009-02-24 15:29:49 +0400
commita34bb2b8d86bfb08884660d280863bc02c52e7ca (patch)
tree39b638f3059d5a325a196d7040c92179045f1882 /libmysqld
parent5a7d6382bf5992b22e3f347258ab68b72b528930 (diff)
parentbe66e43dabe2681705a9adfe3d385496dc827882 (diff)
downloadmariadb-git-a34bb2b8d86bfb08884660d280863bc02c52e7ca.tar.gz
merging.
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 23572ad4929..d644c45a66a 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -43,6 +43,15 @@ extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE];
static my_bool emb_read_query_result(MYSQL *mysql);
+extern "C" void unireg_clear(int exit_code)
+{
+ DBUG_ENTER("unireg_clear");
+ clean_up(!opt_help && (exit_code || !opt_bootstrap)); /* purecov: inspected */
+ my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
+ DBUG_VOID_RETURN;
+}
+
+
/*
Reads error information from the MYSQL_DATA and puts
it into proper MYSQL members