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

Test case fixes

Browse Source
This commit is contained in:
Georg Richter
2013-03-24 14:29:24 +01:00
parent 24c0f0b07d
commit b96a087711
3 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -6,7 +6,7 @@ PROJECT(mariadb-client C)
SET(CPACK_PACKAGE_VERSION_MAJOR 1)
SET(CPACK_PACKAGE_VERSION_MINOR 1)
SET(CPACK_PACKAGE_VERSION_PATCH 0)
SET(CPACK_PACKAGE_VERSION_PATCH 2)
# Minimum required version is Cmake 2.8.x
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)

2
libmariadb/libmariadb.c
View File

@@ -593,7 +593,7 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
result=0;
if (!skipp_check) {
result= ((mysql->packet_length=net_safe_read(mysql)) == packet_error ?
-1 : 0);
1 : 0);
DBUG_PRINT("info", ("packet_length=%llu", mysql->packet_length));
}
end:

51
unittest/libmariadb/ps.c
View File

@@ -4153,7 +4153,7 @@ static int test_set_option(MYSQL *mysql)
mysql_autocommit(mysql, TRUE);
/* LIMIT the rows count to 2 */
rc= mysql_query(mysql, "SET OPTION SQL_SELECT_LIMIT= 2");
rc= mysql_query(mysql, "SET SQL_SELECT_LIMIT= 2");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_limit");
@@ -4193,7 +4193,7 @@ static int test_set_option(MYSQL *mysql)
mysql_stmt_close(stmt);
/* RESET the LIMIT the rows count to 0 */
rc= mysql_query(mysql, "SET OPTION SQL_SELECT_LIMIT=DEFAULT");
rc= mysql_query(mysql, "SET SQL_SELECT_LIMIT=DEFAULT");
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
@@ -4543,6 +4543,52 @@ static int test_stmt_close(MYSQL *mysql)
return OK;
}
static int test_new_date(MYSQL *mysql)
{
MYSQL_STMT *stmt;
MYSQL_BIND bind[1];
int rc;
char buffer[50];
mysql->reconnect= 1;
/* set AUTOCOMMIT to ON*/
mysql_autocommit(mysql, TRUE);
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "CREATE TABLE t1 (a date, b date)");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "INSERT INTO t1 VALUES (now(), now() + INTERVAL 1 day)");
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "SELECT if(1, a, b) FROM t1", 26);
check_stmt_rc(rc, stmt);
memset(bind, 0, sizeof(MYSQL_BIND));
bind[0].buffer_length= 50;
bind[0].buffer= (void *)buffer;
bind[0].buffer_type= MYSQL_TYPE_STRING;
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_result(stmt, bind);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_fetch(stmt);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_fetch(stmt);
FAIL_IF(rc != MYSQL_NO_DATA, "NO DATA expected");
mysql_stmt_close(stmt);
return OK;
}
struct my_tests_st my_tests[] = {
{"test_prepare_insert_update", test_prepare_insert_update, TEST_CONNECTION_DEFAULT, 0, NULL , NULL},
@@ -4606,6 +4652,7 @@ struct my_tests_st my_tests[] = {
{"test_set_variable", test_set_variable, TEST_CONNECTION_DEFAULT, 0, NULL , NULL},
{"test_sqlmode", test_sqlmode, TEST_CONNECTION_DEFAULT, 0, NULL , NULL},
{"test_stmt_close", test_stmt_close, TEST_CONNECTION_DEFAULT, 0, NULL , NULL},
{"test_new_date", test_new_date, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{NULL, NULL, 0, 0, NULL, NULL}
};