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-common | |
| parent | 7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359 (diff) | |
| download | mariadb-git-c1c5222caed889169fab01612b335ef8b5f56ba5.tar.gz | |
cleanup: PSI key is *always* the first argument
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index a8c69c797b0..ee3ec65a233 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -816,7 +816,7 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd) options->init_commands= (DYNAMIC_ARRAY*)my_malloc(key_memory_mysql_options, sizeof(DYNAMIC_ARRAY), MYF(MY_WME)); - my_init_dynamic_array(options->init_commands, key_memory_mysql_options, + my_init_dynamic_array(key_memory_mysql_options, options->init_commands, sizeof(char*),5, 5, MYF(0)); } @@ -4047,9 +4047,10 @@ mysql_options4(MYSQL *mysql,enum mysql_option option, if (!my_hash_inited(&mysql->options.extension->connection_attributes)) { - if (my_hash_init(&mysql->options.extension->connection_attributes, - &my_charset_bin, 0, 0, 0, (my_hash_get_key) get_attr_key, - my_free, HASH_UNIQUE, key_memory_mysql_options)) + if (my_hash_init(key_memory_mysql_options, + &mysql->options.extension->connection_attributes, + &my_charset_bin, 0, 0, 0, (my_hash_get_key) + get_attr_key, my_free, HASH_UNIQUE)) { set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate); DBUG_RETURN(1); |