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

Fix for CONC-71: mysql_real_query crashes after server restart

Browse Source 
- We now check socket status before net_flush (and return error if the socket is dead)
This commit is contained in:
holzboote@googlemail.com
2014-02-04 20:09:23 +01:00
parent 8c0a7fff46
commit db14156eb7
7 changed files with 109 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
unittest/libmariadb/basic-t.c
View File

@@ -30,6 +30,38 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "my_test.h"
#include "ma_common.h"
static int test_conc71(MYSQL *my)
{
int rc;
MYSQL_RES *res;
MYSQL_ROW row;
char *query;
MYSQL *mysql;
/* uncomment if you want to test manually */
return SKIP;
mysql= mysql_init(NULL);
mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "utf8");
mysql_options(mysql, MYSQL_OPT_COMPRESS, 0);
mysql_options(mysql, MYSQL_INIT_COMMAND, "/*!40101 SET SQL_MODE='' */");
mysql_options(mysql, MYSQL_INIT_COMMAND, "/*!40101 set @@session.wait_timeout=28800 */");
FAIL_IF(!mysql_real_connect(mysql, hostname, username, password, schema,
port, socketname, 0), mysql_error(my));
diag("kill server");
sleep(20);
rc= mysql_query(mysql, "SELECT 'foo' FROM DUAL");
check_mysql_rc(rc, mysql);
mysql_close(mysql);
return OK;
}
static int test_conc70(MYSQL *my)
{
int rc;
@@ -37,7 +69,7 @@ static int test_conc70(MYSQL *my)
MYSQL_ROW row;
MYSQL *mysql= mysql_init(NULL);
mysql_query(my, "SET @a:=@@max_allowed_packet");
rc= mysql_query(my, "SET @a:=@@max_allowed_packet");
check_mysql_rc(rc, my);
mysql_query(my, "SET global max_allowed_packet=1024*1024*22");
@@ -84,7 +116,7 @@ static int test_conc68(MYSQL *my)
MYSQL_ROW row;
MYSQL *mysql= mysql_init(NULL);
mysql_query(my, "SET @a:=@@max_allowed_packet");
rc= mysql_query(my, "SET @a:=@@max_allowed_packet");
check_mysql_rc(rc, my);
mysql_query(my, "SET global max_allowed_packet=1024*1024*22");
@@ -648,6 +680,7 @@ static int test_compressed(MYSQL *my)
}
struct my_tests_st my_tests[] = {
{"test_conc71", test_conc71, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc70", test_conc70, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc68", test_conc68, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_compressed", test_compressed, TEST_CONNECTION_NONE, 0, NULL, NULL},