database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Merge branch '3.1' into 3.2

Browse Source
This commit is contained in:
Georg Richter
2021-10-08 10:23:51 +02:00
parent 5cd74de9f1 f6b8fe10c3
commit 0bf84c065e
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libmariadb/ma_client_plugin.c.in
View File

@@ -330,6 +330,7 @@ struct st_mysql_client_plugin * STDCALL
mysql_client_register_plugin(MYSQL *mysql, mysql_client_register_plugin(MYSQL *mysql,
struct st_mysql_client_plugin *plugin) struct st_mysql_client_plugin *plugin)
{ {
struct st_mysql_client_plugin *found_plugin= NULL;
va_list unused; va_list unused;
LINT_INIT_STRUCT(unused); LINT_INIT_STRUCT(unused);
@@ -339,18 +340,11 @@ mysql_client_register_plugin(MYSQL *mysql,
pthread_mutex_lock(&LOCK_load_client_plugin); pthread_mutex_lock(&LOCK_load_client_plugin);
/* make sure the plugin wasn't loaded meanwhile */ /* make sure the plugin wasn't loaded meanwhile */
if (find_plugin(plugin->name, plugin->type)) if (!(found_plugin= find_plugin(plugin->name, plugin->type)))
{ found_plugin= add_plugin(mysql, plugin, 0, 0, unused);
my_set_error(mysql, CR_AUTH_PLUGIN_CANNOT_LOAD,
SQLSTATE_UNKNOWN, ER(CR_AUTH_PLUGIN_CANNOT_LOAD),
plugin->name, "it is already loaded");
plugin= NULL;
}
else
plugin= add_plugin(mysql, plugin, 0, 0, unused);
pthread_mutex_unlock(&LOCK_load_client_plugin); pthread_mutex_unlock(&LOCK_load_client_plugin);
return plugin; return found_plugin;
} }

2
libmariadb/mariadb_lib.c
View File

@@ -4174,7 +4174,7 @@ my_bool mariadb_get_infov(MYSQL *mysql, enum mariadb_value value, void *arg, ...
*((char **)arg)= (char *)ma_pvio_tls_cipher(mysql->net.pvio->ctls); *((char **)arg)= (char *)ma_pvio_tls_cipher(mysql->net.pvio->ctls);
else else
#endif #endif
goto error; *((char **)arg)= NULL;
break; break;
case MARIADB_CLIENT_ERRORS: case MARIADB_CLIENT_ERRORS:
*((char ***)arg)= (char **)client_errors; *((char ***)arg)= (char **)client_errors;