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 /extra/comp_err.c | |
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 'extra/comp_err.c')
-rw-r--r-- | extra/comp_err.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index cf6262f66e2..5e3cec676bc 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -267,6 +267,7 @@ static int create_header_files(struct errors *error_head) fprintf(sql_statef, "/* Autogenerated file, please don't edit */\n\n"); fprintf(er_namef, "/* Autogenerated file, please don't edit */\n\n"); + fprintf(er_definef, "#ifndef ER_ERROR_FIRST\n"); fprintf(er_definef, "#define ER_ERROR_FIRST %d\n", error_head->d_code); current_d_code= error_head->d_code -1; @@ -314,6 +315,7 @@ static int create_header_files(struct errors *error_head) } /* finishing off with mysqld_error.h */ fprintf(er_definef, "#define ER_ERROR_LAST %d\n", er_last); + fprintf(er_definef, "#endif /* ER_ERROR_FIRST */\n"); my_fclose(er_definef, MYF(0)); my_fclose(sql_statef, MYF(0)); my_fclose(er_namef, MYF(0)); |