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 dipika.(none):/opt/local/work/mysql-5.0-runtime

Browse Source 
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
This commit is contained in:
kostja@dipika.(none)
2008-02-26 15:32:32 +03:00
parent 461de0f35c 74addb78e4
commit 34f9ead01a
1 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
tests/mysql_client_test.c
View File

@ -8973,8 +8973,8 @@ static void test_sqlmode()
strmov(c1, "My"); strmov(c2, "SQL"); strmov(c1, "My"); strmov(c2, "SQL");
rc= mysql_stmt_execute(stmt); rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc); check_execute(stmt, rc);
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
verify_col_data("test_piping", "name", "MySQL"); verify_col_data("test_piping", "name", "MySQL");
rc= mysql_query(mysql, "DELETE FROM test_piping"); rc= mysql_query(mysql, "DELETE FROM test_piping");
@ -13282,7 +13282,7 @@ from t2);");
static void test_bug8378() static void test_bug8378()
{ {
#if defined(HAVE_CHARSET_gbk) && !defined(EMBEDDED_LIBRARY) #if defined(HAVE_CHARSET_gbk) && !defined(EMBEDDED_LIBRARY)
MYSQL *old_mysql=mysql; MYSQL *lmysql;
char out[9]; /* strlen(TEST_BUG8378)*2+1 */ char out[9]; /* strlen(TEST_BUG8378)*2+1 */
char buf[256]; char buf[256];
int len, rc; int len, rc;
@ -13291,17 +13291,17 @@ static void test_bug8378()
if (!opt_silent) if (!opt_silent)
fprintf(stdout, "\n Establishing a test connection ..."); fprintf(stdout, "\n Establishing a test connection ...");
if (!(mysql= mysql_init(NULL))) if (!(lmysql= mysql_init(NULL)))
{ {
myerror("mysql_init() failed"); myerror("mysql_init() failed");
exit(1); exit(1);
} }
if (mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "gbk")) if (mysql_options(lmysql, MYSQL_SET_CHARSET_NAME, "gbk"))
{ {
myerror("mysql_options() failed"); myerror("mysql_options() failed");
exit(1); exit(1);
} }
if (!(mysql_real_connect(mysql, opt_host, opt_user, if (!(mysql_real_connect(lmysql, opt_host, opt_user,
opt_password, current_db, opt_port, opt_password, current_db, opt_port,
opt_unix_socket, 0))) opt_unix_socket, 0)))
{ {
@ -13311,19 +13311,17 @@ static void test_bug8378()
if (!opt_silent) if (!opt_silent)
fprintf(stdout, "OK"); fprintf(stdout, "OK");
len= mysql_real_escape_string(mysql, out, TEST_BUG8378_IN, 4); len= mysql_real_escape_string(lmysql, out, TEST_BUG8378_IN, 4);
/* No escaping should have actually happened. */ /* No escaping should have actually happened. */
DIE_UNLESS(memcmp(out, TEST_BUG8378_OUT, len) == 0); DIE_UNLESS(memcmp(out, TEST_BUG8378_OUT, len) == 0);
sprintf(buf, "SELECT '%s'", out); sprintf(buf, "SELECT '%s'", out);
rc=mysql_real_query(mysql, buf, strlen(buf)); rc=mysql_real_query(lmysql, buf, strlen(buf));
myquery(rc); myquery(rc);
mysql_close(mysql); mysql_close(lmysql);
mysql=old_mysql;
#endif #endif
} }
@ -15160,7 +15158,7 @@ static void test_opt_reconnect()
if (mysql_options(lmysql, MYSQL_OPT_RECONNECT, &my_true)) if (mysql_options(lmysql, MYSQL_OPT_RECONNECT, &my_true))
{ {
myerror("mysql_options failed: unknown option MYSQL_OPT_RECONNECT\n"); myerror("mysql_options failed: unknown option MYSQL_OPT_RECONNECT\n");
exit(1); DIE_UNLESS(0);
} }
/* reconnect should be 1 */ /* reconnect should be 1 */
@ -15173,7 +15171,7 @@ static void test_opt_reconnect()
opt_unix_socket, 0))) opt_unix_socket, 0)))
{ {
myerror("connection failed"); myerror("connection failed");
exit(1); DIE_UNLESS(0);
} }
/* reconnect should still be 1 */ /* reconnect should still be 1 */
@ -15187,7 +15185,7 @@ static void test_opt_reconnect()
if (!(lmysql= mysql_init(NULL))) if (!(lmysql= mysql_init(NULL)))
{ {
myerror("mysql_init() failed"); myerror("mysql_init() failed");
exit(1); DIE_UNLESS(0);
} }
if (!opt_silent) if (!opt_silent)
@ -15199,7 +15197,7 @@ static void test_opt_reconnect()
opt_unix_socket, 0))) opt_unix_socket, 0)))
{ {
myerror("connection failed"); myerror("connection failed");
exit(1); DIE_UNLESS(0);
} }
/* reconnect should still be 0 */ /* reconnect should still be 0 */
@ -15217,32 +15215,32 @@ static void test_opt_reconnect()
static void test_bug12744() static void test_bug12744()
{ {
MYSQL_STMT *prep_stmt = NULL; MYSQL_STMT *prep_stmt = NULL;
MYSQL *lmysql;
int rc; int rc;
myheader("test_bug12744"); myheader("test_bug12744");
prep_stmt= mysql_stmt_init(mysql); lmysql= mysql_init(NULL);
DIE_UNLESS(lmysql);
if (!mysql_real_connect(lmysql, opt_host, opt_user, opt_password,
current_db, opt_port, opt_unix_socket, 0))
{
fprintf(stderr, "Failed to connect to the database\n");
DIE_UNLESS(0);
}
prep_stmt= mysql_stmt_init(lmysql);
rc= mysql_stmt_prepare(prep_stmt, "SELECT 1", 8); rc= mysql_stmt_prepare(prep_stmt, "SELECT 1", 8);
DIE_UNLESS(rc == 0); DIE_UNLESS(rc == 0);
mysql_close(mysql); mysql_close(lmysql);
if ((rc= mysql_stmt_execute(prep_stmt))) rc= mysql_stmt_execute(prep_stmt);
{ DIE_UNLESS(rc);
if ((rc= mysql_stmt_reset(prep_stmt))) rc= mysql_stmt_reset(prep_stmt);
printf("OK!\n"); DIE_UNLESS(rc);
else
{
printf("Error!");
DIE_UNLESS(1==0);
}
}
else
{
fprintf(stderr, "expected error but no error occured\n");
DIE_UNLESS(1==0);
}
rc= mysql_stmt_close(prep_stmt); rc= mysql_stmt_close(prep_stmt);
client_connect(0); DIE_UNLESS(rc == 0);
} }
#endif /* EMBEDDED_LIBRARY */ #endif /* EMBEDDED_LIBRARY */
@ -16106,6 +16104,7 @@ static void test_bug24179()
mysql_stmt_error(stmt)); mysql_stmt_error(stmt));
} }
DIE_UNLESS(mysql_stmt_errno(stmt) == 1323); DIE_UNLESS(mysql_stmt_errno(stmt) == 1323);
mysql_stmt_close(stmt);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }