database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Revert "MDEV-9293 Connector/C integration"

Browse Source 
This reverts commit 7b89b9f510.
This commit is contained in:
Vladislav Vaintroub
2016-08-19 15:46:27 +00:00
parent 7b89b9f510
commit 31a8cf54c8
61 changed files with 412 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
tests/mysql_client_test.c
View File

@@ -34,22 +34,8 @@
#include "mysql_client_fw.c"
static const my_bool my_true= 1;
/* Query processing */
static my_bool get_reconnect(MYSQL *mysql)
{
#ifdef EMBEDDED_LIBRARY
return mysql->reconnect;
#else
my_bool reconnect;
mysql_get_option(mysql, MYSQL_OPT_RECONNECT, &reconnect);
return reconnect;
#endif
}
static void client_query()
{
int rc;
@@ -3137,7 +3123,7 @@ static void test_long_data_str1()
int rc, i;
char data[255];
long length;
ulong max_blob_length, blob_length= 0, length1;
ulong max_blob_length, blob_length, length1;
my_bool true_value;
MYSQL_RES *result;
MYSQL_BIND my_bind[2];
@@ -4826,7 +4812,7 @@ static void test_stmt_close()
myerror("connection failed");
exit(1);
}
mysql_options(lmysql, MYSQL_OPT_RECONNECT, &my_true);
lmysql->reconnect= 1;
if (!opt_silent)
fprintf(stdout, "OK");
@@ -5510,7 +5496,7 @@ DROP TABLE IF EXISTS test_multi_tab";
fprintf(stdout, "\n connection failed(%s)", mysql_error(mysql_local));
exit(1);
}
mysql_options(mysql_local, MYSQL_OPT_RECONNECT, &my_true);
mysql_local->reconnect= 1;
rc= mysql_query(mysql_local, query);
myquery(rc);
@@ -5634,7 +5620,7 @@ static void test_prepare_multi_statements()
fprintf(stderr, "\n connection failed(%s)", mysql_error(mysql_local));
exit(1);
}
mysql_options(mysql_local, MYSQL_OPT_RECONNECT, &my_true);
mysql_local->reconnect= 1;
strmov(query, "select 1; select 'another value'");
stmt= mysql_simple_prepare(mysql_local, query);
check_stmt_r(stmt);
@@ -6350,8 +6336,6 @@ static void test_pure_coverage()
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
#if 0
/* MariaDB C/C converts geometry to string */
my_bind[0].buffer_type= MYSQL_TYPE_GEOMETRY;
rc= mysql_stmt_bind_result(stmt, my_bind);
check_execute_r(stmt, rc); /* unsupported buffer type */
@@ -6362,7 +6346,6 @@ static void test_pure_coverage()
rc= mysql_stmt_store_result(stmt);
DIE_UNLESS(rc); /* Old error must be reset first */
#endif
mysql_stmt_close(stmt);
mysql_query(mysql, "DROP TABLE test_pure");
@@ -7242,7 +7225,7 @@ static void test_prepare_grant()
mysql_close(lmysql);
exit(1);
}
mysql_options(lmysql, MYSQL_OPT_RECONNECT, &my_true);
lmysql->reconnect= 1;
if (!opt_silent)
fprintf(stdout, "OK");
@@ -7704,7 +7687,7 @@ static void test_drop_temp()
mysql_close(lmysql);
exit(1);
}
mysql_options(lmysql, MYSQL_OPT_RECONNECT, &my_true);
lmysql->reconnect= 1;
if (!opt_silent)
fprintf(stdout, "OK");
@@ -13419,7 +13402,10 @@ static void test_bug9478()
/* Fill in the fetch packet */
int4store(buff, stmt->stmt_id);
buff[4]= 1; /* prefetch rows */
rc= mysql_stmt_fetch(stmt);
rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH,
(uchar*) buff,
sizeof(buff), 0,0,1,NULL) ||
(*mysql->methods->read_query_result)(mysql));
DIE_UNLESS(rc);
if (!opt_silent && i == 0)
printf("Got error (as expected): %s\n", mysql_error(mysql));
@@ -15006,7 +14992,7 @@ static void test_bug15510()
static void test_opt_reconnect()
{
MYSQL *lmysql;
my_bool my_true= TRUE;
myheader("test_opt_reconnect");
@@ -15017,8 +15003,8 @@ static void test_opt_reconnect()
}
if (!opt_silent)
fprintf(stdout, "reconnect before mysql_options: %d\n", get_reconnect(lmysql));
DIE_UNLESS(get_reconnect(lmysql) == 0);
fprintf(stdout, "reconnect before mysql_options: %d\n", lmysql->reconnect);
DIE_UNLESS(lmysql->reconnect == 0);
if (mysql_options(lmysql, MYSQL_OPT_RECONNECT, &my_true))
{
@@ -15028,8 +15014,8 @@ static void test_opt_reconnect()
/* reconnect should be 1 */
if (!opt_silent)
fprintf(stdout, "reconnect after mysql_options: %d\n", get_reconnect(lmysql));
DIE_UNLESS(get_reconnect(lmysql) == 1);
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,
@@ -15042,8 +15028,8 @@ static void test_opt_reconnect()
/* reconnect should still be 1 */
if (!opt_silent)
fprintf(stdout, "reconnect after mysql_real_connect: %d\n",
get_reconnect(lmysql));
DIE_UNLESS(get_reconnect(lmysql) == 1);
lmysql->reconnect);
DIE_UNLESS(lmysql->reconnect == 1);
mysql_close(lmysql);
@@ -15054,8 +15040,8 @@ static void test_opt_reconnect()
}
if (!opt_silent)
fprintf(stdout, "reconnect before mysql_real_connect: %d\n", get_reconnect(lmysql));
DIE_UNLESS(get_reconnect(lmysql) == 0);
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,
@@ -15068,8 +15054,8 @@ static void test_opt_reconnect()
/* reconnect should still be 0 */
if (!opt_silent)
fprintf(stdout, "reconnect after mysql_real_connect: %d\n",
get_reconnect(lmysql));
DIE_UNLESS(get_reconnect(lmysql) == 0);
lmysql->reconnect);
DIE_UNLESS(lmysql->reconnect == 0);
mysql_close(lmysql);
}
@@ -17999,8 +17985,7 @@ static void test_bug43560(void)
strncpy(buffer, values[2], BUFSIZE);
length= strlen(buffer);
rc= mysql_stmt_execute(stmt);
DIE_UNLESS(rc && (mysql_stmt_errno(stmt) == CR_SERVER_LOST ||
mysql_stmt_errno(stmt) == CR_SERVER_GONE_ERROR));
DIE_UNLESS(rc && mysql_stmt_errno(stmt) == CR_SERVER_LOST);
opt_drop_db= 0;
client_disconnect(conn);