database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
This commit is contained in:
msvensson@neptunus.(none)
2006-01-30 11:02:09 +01:00
parent ae9b056d9b 41c6fee874
commit a6c508dbf3
2 changed files with 95 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
tests/mysql_client_test.c
View File

@ -14598,7 +14598,6 @@ static void test_bug14845()
static void test_bug15510()
{
MYSQL_STMT *stmt;
MYSQL_RES *res;
int rc;
const char *query= "select 1 from dual where 1/0";
@ -14624,6 +14623,80 @@ static void test_bug15510()
myquery(rc);
}
/* Test MYSQL_OPT_RECONNECT, Bug#15719 */
static void test_opt_reconnect()
{
MYSQL *lmysql;
my_bool my_true= TRUE;
myheader("test_opt_reconnect");
if (!(lmysql= mysql_init(NULL)))
{
myerror("mysql_init() failed");
exit(1);
}
if (!opt_silent)
fprintf(stdout, "reconnect before mysql_options: %d\n", lmysql->reconnect);
DIE_UNLESS(lmysql->reconnect == 0);
if (mysql_options(lmysql, MYSQL_OPT_RECONNECT, &my_true))
{
myerror("mysql_options failed: unknown option MYSQL_OPT_RECONNECT\n");
exit(1);
}
/* reconnect should be 1 */
if (!opt_silent)
fprintf(stdout, "reconnect after mysql_options: %d\n", lmysql->reconnect);
DIE_UNLESS(lmysql->reconnect == 1);
if (!(mysql_real_connect(lmysql, opt_host, opt_user,
opt_password, current_db, opt_port,
opt_unix_socket, 0)))
{
myerror("connection failed");
exit(1);
}
/* reconnect should still be 1 */
if (!opt_silent)
fprintf(stdout, "reconnect after mysql_real_connect: %d\n",
lmysql->reconnect);
DIE_UNLESS(lmysql->reconnect == 1);
mysql_close(lmysql);
if (!(lmysql= mysql_init(NULL)))
{
myerror("mysql_init() failed");
exit(1);
}
if (!opt_silent)
fprintf(stdout, "reconnect before mysql_real_connect: %d\n", lmysql->reconnect);
DIE_UNLESS(lmysql->reconnect == 0);
if (!(mysql_real_connect(lmysql, opt_host, opt_user,
opt_password, current_db, opt_port,
opt_unix_socket, 0)))
{
myerror("connection failed");
exit(1);
}
/* reconnect should still be 0 */
if (!opt_silent)
fprintf(stdout, "reconnect after mysql_real_connect: %d\n",
lmysql->reconnect);
DIE_UNLESS(lmysql->reconnect == 0);
mysql_close(lmysql);
}
/* Bug #16144: mysql_stmt_attr_get type error */
static void test_bug16144()
@ -14964,7 +15037,9 @@ static struct my_tests_st my_tests[]= {
{ "test_bug13488", test_bug13488 },
{ "test_bug13524", test_bug13524 },
{ "test_bug14845", test_bug14845 },
{ "test_bug15510", test_bug15510},
{ "test_bug15510", test_bug15510 },
{ "test_opt_reconnect", test_opt_reconnect },
{ "test_bug16144", test_bug16144 },
{ "test_bug15613", test_bug15613 },
{ 0, 0 }