diff options
| author | Monty <monty@mariadb.org> | 2018-01-04 16:21:18 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-04 16:24:09 +0200 |
| commit | 5e0b13d1734942d860416ed1b51f7dd75760e020 (patch) | |
| tree | c4af4ad467c87748e7aaba032902ef7d4f49eb9c /sql/mdl.cc | |
| parent | c584a496d7000def48b8aad1f065c07f147998a3 (diff) | |
| download | mariadb-git-5e0b13d1734942d860416ed1b51f7dd75760e020.tar.gz | |
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
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 25809c3d9cc..f5c5d06328d 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -19,7 +19,7 @@ #include "sql_array.h" #include "rpl_rli.h" #include <lf.h> -#include <mysqld_error.h> +#include "unireg.h" #include <mysql/plugin.h> #include <mysql/service_thd_wait.h> #include <mysql/psi/mysql_stage.h> |