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

- Fixed several aurora plugin crashes (after reconnect)

Browse Source 
- moved mysql->reconnect to mysql->options.reconnect
This commit is contained in:
Georg Richter
2016-01-16 07:04:28 +01:00
parent 77fec5c58f
commit f8912935b1
14 changed files with 351 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
unittest/libmariadb/my_test.h
View File

@@ -374,7 +374,6 @@ int check_variable(MYSQL *mysql, char *variable, char *value)
*/
MYSQL *test_connect(struct my_tests_st *test) {
MYSQL *mysql;
char query[255];
int i= 0;
int timeout= 10;
int truncation_report= 1;
@@ -401,7 +400,7 @@ MYSQL *test_connect(struct my_tests_st *test) {
}
}
if (!(mysql_real_connect(mysql, hostname, username, password,
NULL, port, socketname, (test) ? test->connect_flags:0)))
schema, port, socketname, (test) ? test->connect_flags:0)))
{
diag("Couldn't establish connection to server %s. Error (%d): %s",
hostname, mysql_errno(mysql), mysql_error(mysql));
@@ -409,24 +408,6 @@ MYSQL *test_connect(struct my_tests_st *test) {
return(NULL);
}
/* change database or create if it doesn't exist */
if (mysql_select_db(mysql, schema)) {
diag("Error number: %d", mysql_errno(mysql));
if(mysql_errno(mysql) == 1049) {
sprintf(query, "CREATE DATABASE %s", schema);
if (mysql_query(mysql, query)) {
diag("Can't create database %s", schema);
mysql_close(mysql);
return NULL;
}
} else {
diag("Error (%d): %s", mysql_errno(mysql), mysql_error(mysql));
mysql_close(mysql);
return NULL;
}
}
return(mysql);
}
@@ -526,6 +507,7 @@ void run_tests(struct my_tests_st *test) {
}
}
if (mysql_default) {
diag("close default");
mysql_close(mysql_default);
}
mysql_server_end();