diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-27 11:52:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:23 +0100 |
| commit | c1c5222caed889169fab01612b335ef8b5f56ba5 (patch) | |
| tree | 5a51707f5e35c4bd3a8cbccc4fd08a9fd67f6914 /extra | |
| parent | 7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359 (diff) | |
| download | mariadb-git-c1c5222caed889169fab01612b335ef8b5f56ba5.tar.gz | |
cleanup: PSI key is *always* the first argument
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/comp_err.c | 4 | ||||
| -rw-r--r-- | extra/mariabackup/xbstream.cc | 6 | ||||
| -rw-r--r-- | extra/resolve_stack_dump.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index c83a416d2a7..52353ac9eea 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -958,7 +958,7 @@ static struct errors *generate_empty_message(uint d_code, my_bool skip) if (!(new_error= (struct errors *) my_malloc(PSI_NOT_INSTRUMENTED, sizeof(*new_error), MYF(MY_WME)))) return(0); - if (my_init_dynamic_array(&new_error->msg, PSI_NOT_INSTRUMENTED, + if (my_init_dynamic_array(PSI_NOT_INSTRUMENTED, &new_error->msg, sizeof(struct message), 0, 1, MYF(0))) return(0); /* OOM: Fatal error */ @@ -999,7 +999,7 @@ static struct errors *parse_error_string(char *str, int er_count) DBUG_RETURN(0); new_error->next_error= 0; - if (my_init_dynamic_array(&new_error->msg, PSI_NOT_INSTRUMENTED, + if (my_init_dynamic_array(PSI_NOT_INSTRUMENTED, &new_error->msg, sizeof(struct message), 0, 0, MYF(0))) DBUG_RETURN(0); diff --git a/extra/mariabackup/xbstream.cc b/extra/mariabackup/xbstream.cc index 34576434eb4..ba55141cdd9 100644 --- a/extra/mariabackup/xbstream.cc +++ b/extra/mariabackup/xbstream.cc @@ -495,9 +495,9 @@ mode_extract(int n_threads, int argc __attribute__((unused)), pthread_mutex_t mutex; int ret = 0; - if (my_hash_init(&filehash, &my_charset_bin, START_FILE_HASH_SIZE, - 0, 0, (my_hash_get_key) get_file_entry_key, - (my_hash_free_key) file_entry_free, MYF(0), PSI_NOT_INSTRUMENTED)) { + if (my_hash_init(PSI_NOT_INSTRUMENTED, &filehash, &my_charset_bin, + START_FILE_HASH_SIZE, 0, 0, (my_hash_get_key) get_file_entry_key, + (my_hash_free_key) file_entry_free, MYF(0))) { msg("%s: failed to initialize file hash.", my_progname); return 1; } diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c index 15a2a0e9bf1..195ad73a927 100644 --- a/extra/resolve_stack_dump.c +++ b/extra/resolve_stack_dump.c @@ -224,7 +224,7 @@ static int init_sym_entry(SYM_ENTRY* se, char* buf) static void init_sym_table() { char buf[512]; - if (my_init_dynamic_array(&sym_table, PSI_NOT_INSTRUMENTED, sizeof(SYM_ENTRY), + if (my_init_dynamic_array(PSI_NOT_INSTRUMENTED, &sym_table, sizeof(SYM_ENTRY), INIT_SYM_TABLE, INC_SYM_TABLE, MYF(0))) die("Failed in my_init_dynamic_array() -- looks like out of memory problem"); |