summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@oracle.com>2011-03-29 14:43:49 +0200
committerMagne Mahre <magne.mahre@oracle.com>2011-03-29 14:43:49 +0200
commit517c5c247c217203e075a0f8b61e614e8dc6623f (patch)
tree3b6d0fd06e191c69e6e0da8a63e81166e5b90513 /extra
parentf239fa302cd4acc97c406ae071cefc903bb5de79 (diff)
downloadmariadb-git-517c5c247c217203e075a0f8b61e614e8dc6623f.tar.gz
Bug#11933945 REMOVE LGPL LICENSED FILES IN MYSQL 5.5
The LGPL license is used in some legacy code, and to adhere to current licensing polity, we remove those files that are no longer used, and reorganize the remaining LGPL code so it will be GPL licensed from now on. Note: This patch only removed LGPL licensed files in MySQL 5.5 and later, and is the third of a set of patches to remove LGPL from all trees. (See Bug# 11840513 for details)
Diffstat (limited to 'extra')
-rw-r--r--extra/perror.c34
1 files changed, 33 insertions, 1 deletions
diff --git a/extra/perror.c b/extra/perror.c
index 382805c5dfd..3c00b9b11d7 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -32,7 +32,7 @@ static my_bool verbose, print_all_codes;
#include "../include/my_base.h"
#include "../mysys/my_handler_errors.h"
-#include "../include/my_handler.h"
+// #include "../include/my_compare.h"
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
static my_bool ndb_code;
@@ -240,7 +240,39 @@ static my_bool print_win_error_msg(DWORD error, my_bool verbose)
}
#endif
+/*
+ Register handler error messages for usage with my_error()
+ NOTES
+ This is safe to call multiple times as my_error_register()
+ will ignore calls to register already registered error numbers.
+*/
+
+static const char **get_handler_error_messages()
+{
+ return handler_error_messages;
+}
+
+void my_handler_error_register(void)
+{
+ /*
+ If you got compilation error here about compile_time_assert array, check
+ that every HA_ERR_xxx constant has a corresponding error message in
+ handler_error_messages[] list (check mysys/ma_handler_errors.h and
+ include/my_base.h).
+ */
+ compile_time_assert(HA_ERR_FIRST + array_elements(handler_error_messages) ==
+ HA_ERR_LAST + 1);
+ my_error_register(get_handler_error_messages, HA_ERR_FIRST,
+ HA_ERR_FIRST+ array_elements(handler_error_messages)-1);
+}
+
+
+void my_handler_error_unregister(void)
+{
+ my_error_unregister(HA_ERR_FIRST,
+ HA_ERR_FIRST+ array_elements(handler_error_messages)-1);
+}
int main(int argc,char *argv[])
{