diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/comp_err.c | 2 | ||||
| -rw-r--r-- | extra/mysqld_safe_helper.c | 2 |
2 files changed, 3 insertions, 1 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)); diff --git a/extra/mysqld_safe_helper.c b/extra/mysqld_safe_helper.c index 2ccff20b910..5c50b2300d4 100644 --- a/extra/mysqld_safe_helper.c +++ b/extra/mysqld_safe_helper.c @@ -14,7 +14,7 @@ void my_exit(int c) exit(c); } -void do_usage() +void do_usage(void) { printf("Usage:\n" " %s <user> log <filename>\n" |