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 /sql/sql_plugin.cc | |
| parent | 7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359 (diff) | |
| download | mariadb-git-c1c5222caed889169fab01612b335ef8b5f56ba5.tar.gz | |
cleanup: PSI key is *always* the first argument
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 1555755bb36..478fd4b4335 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1608,26 +1608,24 @@ int plugin_init(int *argc, char **argv, int flags) init_alloc_root(key_memory_plugin_mem_root, &plugin_vars_mem_root, 4096, 4096, MYF(0)); init_alloc_root(PSI_NOT_INSTRUMENTED, &tmp_root, 4096, 4096, MYF(0)); - if (my_hash_init(&bookmark_hash, &my_charset_bin, 32, 0, 0, - get_bookmark_hash_key, NULL, HASH_UNIQUE, - key_memory_plugin_bookmark)) + if (my_hash_init(key_memory_plugin_bookmark, &bookmark_hash, &my_charset_bin, 32, 0, 0, + get_bookmark_hash_key, NULL, HASH_UNIQUE)) goto err; /* The 80 is from 2016-04-27 when we had 71 default plugins Big enough to avoid many mallocs even in future */ - if (my_init_dynamic_array(&plugin_dl_array, key_memory_mysql_plugin_dl, + if (my_init_dynamic_array(key_memory_mysql_plugin_dl, &plugin_dl_array, sizeof(struct st_plugin_dl *), 16, 16, MYF(0)) || - my_init_dynamic_array(&plugin_array, key_memory_mysql_plugin, + my_init_dynamic_array(key_memory_mysql_plugin, &plugin_array, sizeof(struct st_plugin_int *), 80, 32, MYF(0))) goto err; for (i= 0; i < MYSQL_MAX_PLUGIN_TYPE_NUM; i++) { - if (my_hash_init(&plugin_hash[i], system_charset_info, 32, 0, 0, - get_plugin_hash_key, NULL, HASH_UNIQUE, - key_memory_plugin_mem_root)) + if (my_hash_init(key_memory_plugin_mem_root, &plugin_hash[i], system_charset_info, 32, 0, 0, + get_plugin_hash_key, NULL, HASH_UNIQUE)) goto err; } |