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

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
index 3c90f03a5fb..a6122a7b1bc 100644
--- a/sql/wsrep_var.cc
+++ b/sql/wsrep_var.cc
@@ -348,7 +348,7 @@ bool wsrep_provider_update (sys_var *self, THD* thd, enum_var_type type)
 
   if (wsrep_init())
   {
-    my_error(ER_CANT_OPEN_LIBRARY, MYF(0), tmp);
+    my_error(ER_CANT_OPEN_LIBRARY, MYF(0), tmp, my_error, "wsrep_init failed");
     rcode = true;
   }
   free(tmp);