diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | extra/comp_err.c | 1 | ||||
| -rw-r--r-- | innobase/os/os0proc.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 0d5a8647198..ad24b223558 100644 --- a/.bzrignore +++ b/.bzrignore @@ -986,3 +986,4 @@ vio/viotest-ssl extra/mysqld_error.h extra/sql_state.h extra/created_include_files +extra/mysqld_ername.h diff --git a/extra/comp_err.c b/extra/comp_err.c index 7f6b6a5996b..89fa958e6c1 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -243,6 +243,7 @@ static int create_header_files(struct errors *error_head) fprintf(er_definef, "#define ER_ERROR_MESSAGES %d\n", er_count); my_fclose(er_definef, MYF(0)); my_fclose(sql_statef, MYF(0)); + my_fclose(er_namef, MYF(0)); DBUG_RETURN(0); } diff --git a/innobase/os/os0proc.c b/innobase/os/os0proc.c index 98254ae1055..dd2037695b7 100644 --- a/innobase/os/os0proc.c +++ b/innobase/os/os0proc.c @@ -565,7 +565,7 @@ os_mem_alloc_large( if (ptr) { if (set_to_zero) { #ifdef UNIV_SET_MEM_TO_ZERO - memset(ret, '\0', size); + memset(ptr, '\0', size); #endif } |