From 5e0b13d1734942d860416ed1b51f7dd75760e020 Mon Sep 17 00:00:00 2001 From: Monty Date: Thu, 4 Jan 2018 16:21:18 +0200 Subject: Fixed wrong arguments to printf and related functions Other things, mainly to get create_mysqld_error_find_printf_error tool to work: - Added protection to not include mysqld_error.h twice - Include "unireg.h" instead of "mysqld_error.h" in server - Added protection if ER_XX messages are already defined - Removed wrong calls to my_error(ER_OUTOFMEMORY) as my_malloc() and my_alloc will do this automatically - Added missing %s to ER_DUP_QUERY_NAME - Removed old and wrong calls to my_strerror() when using MY_ERROR_ON_RENAME (wrong merge) - Fixed deadlock error message from Galera. Before the extra information given to ER_LOCK_DEADLOCK was missing because ER_LOCK_DEADLOCK doesn't provide any extra information. I kept #ifdef mysqld_error_find_printf_error_used in sql_acl.h to make it easy to do this kind of check again in the future --- sql/share/errmsg-utf8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/share') diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index dfb3bf970d5..ade9d53cdb7 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7570,7 +7570,7 @@ ER_WITH_COL_WRONG_LIST ER_TOO_MANY_DEFINITIONS_IN_WITH_CLAUSE eng "Too many WITH elements in WITH clause" ER_DUP_QUERY_NAME - eng "Duplicate query name in WITH clause" + eng "Duplicate query name in WITH clause '%s'" ER_RECURSIVE_WITHOUT_ANCHORS eng "No anchors for recursive WITH element '%s'" ER_UNACCEPTABLE_MUTUAL_RECURSION -- cgit v1.2.1