database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-05 15:55:58 +03:00
Code Activity

Test fixes:

Browse Source 
for api functions which require string with length parameter (e.g.
  mysql_real_connect() or mysql_stmt_prepare() we now use the macro
  SL(string) which substitutes string and string length.
This commit is contained in:
Georg Richter
2018-02-16 13:05:35 +01:00
parent 5a30aed376
commit 83eef02ec8
19 changed files with 358 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/libmariadb/CMakeLists.txt
View File

@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include
${CC_SOURCE_DIR}/unittest/libmariadb)
ADD_DEFINITIONS(-DLIBMARIADB)
SET(API_TESTS "bulk1" "performance" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection" "misc" "ps_new" "sqlite3" "thread" "features-10_2" "bulk1")
SET(API_TESTS "bulk1" "performance" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection" "misc" "ps_new" "thread" "features-10_2" "bulk1")
IF(WITH_DYNCOL)
SET(API_TESTS ${API_TESTS} "dyncol")
ENDIF()

2
unittest/libmariadb/async.c
View File

@@ -28,8 +28,6 @@
#include <stdio.h>
#include <mysql.h>
#define SL(s) (s), sizeof(s)
my_bool skip_async= 0;
static int test_async(MYSQL *mysql)

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

@@ -389,7 +389,7 @@ static int test_bad_union(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
FAIL_UNLESS(rc && mysql_errno(mysql) == 1222, "Error expected");
mysql_stmt_close(stmt);

28
unittest/libmariadb/bulk1.c
View File

@@ -69,7 +69,7 @@ static int bulk1(MYSQL *mysql)
rc= mysql_query(mysql, "CREATE TABLE bulk1 (a int , b VARCHAR(255))");
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, stmt_str, (unsigned long)strlen(stmt_str));
rc= mysql_stmt_prepare(stmt, SL(stmt_str));
check_stmt_rc(rc, stmt);
/* allocate memory */
@@ -155,7 +155,7 @@ static int bulk2(MYSQL *mysql)
rc= mysql_query(mysql, "CREATE TABLE bulk2 (a int default 4, b int default 2)");
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk2 VALUES (?,1)", -1);
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO bulk2 VALUES (?,1)"));
check_stmt_rc(rc, stmt);
memset(bind, 0, 2 * sizeof(MYSQL_BIND));
@@ -211,7 +211,7 @@ static int bulk3(MYSQL *mysql)
rc= mysql_query(mysql, "CREATE TABLE bulk3 (name varchar(20), row int)");
check_mysql_rc(rc,mysql);
rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk3 VALUES (?,?)", -1);
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO bulk3 VALUES (?,?)"));
check_stmt_rc(rc, stmt);
memset(bind, 0, sizeof(MYSQL_BIND)*2);
@@ -265,7 +265,7 @@ static int bulk4(MYSQL *mysql)
rc= mysql_query(mysql, "CREATE TABLE bulk4 (name varchar(20), row int not null default 3)");
check_mysql_rc(rc,mysql);
rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk4 VALUES (?,?)", -1);
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO bulk4 VALUES (?,?)"));
check_stmt_rc(rc, stmt);
memset(bind, 0, sizeof(MYSQL_BIND)*2);
@@ -379,7 +379,7 @@ static int bulk5(MYSQL *mysql)
memset(bind, 0, sizeof(MYSQL_BIND) * 3);
rc= mysql_stmt_prepare(stmt, "UPDATE bulk5 SET a=? WHERE a=?", -1);
rc= mysql_stmt_prepare(stmt, SL("UPDATE bulk5 SET a=? WHERE a=?"));
check_stmt_rc(rc, stmt);
bind[0].buffer_type= MYSQL_TYPE_LONG;
@@ -443,7 +443,7 @@ static int bulk6(MYSQL *mysql)
memset(bind, 0, sizeof(MYSQL_BIND) * 3);
/* 1st case: UPDATE */
rc= mysql_stmt_prepare(stmt, "UPDATE bulk6 SET a=?, b=? WHERE a=?", -1);
rc= mysql_stmt_prepare(stmt, SL("UPDATE bulk6 SET a=?, b=? WHERE a=?"));
check_stmt_rc(rc, stmt);
bind[0].buffer_type= MYSQL_TYPE_LONG;
@@ -479,7 +479,7 @@ static int bulk6(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk6 VALUES (?,?)", -1);
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO bulk6 VALUES (?,?)"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size);
@@ -549,7 +549,7 @@ static int test_conc243(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk_example2 VALUES (?,?,?)", -1);
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO bulk_example2 VALUES (?,?,?)"));
check_stmt_rc(rc, stmt);
memset(bind, 0, sizeof(MYSQL_BIND) * 3);
@@ -611,7 +611,7 @@ static int bulk7(MYSQL *mysql)
rc= mysql_query(mysql, "INSERT INTO t1 VALUES (1)");
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, "UPDATE t1 SET a=a+1", -1);
rc= mysql_stmt_prepare(stmt, SL("UPDATE t1 SET a=a+1"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size);
@@ -648,7 +648,7 @@ static int test_char_conv1(MYSQL *mysql)
rc= mysql_query(mysql, "CREATE TABLE char_conv (a varchar(20)) CHARSET=latin1");
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, "INSERT INTO char_conv VALUES (?)", -1);
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO char_conv VALUES (?)"));
check_stmt_rc(rc, stmt);
memset(&bind_in, 0, sizeof(MYSQL_BIND));
@@ -666,7 +666,7 @@ static int test_char_conv1(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "SELECT a from char_conv", -1);
rc= mysql_stmt_prepare(stmt, SL("SELECT a from char_conv"));
check_stmt_rc(rc, stmt);
memset(&bind_out, 0, sizeof(MYSQL_BIND));
@@ -722,7 +722,7 @@ static int test_char_conv2(MYSQL *mysql)
rc= mysql_query(mysql, "CREATE TABLE char_conv (a varchar(20)) CHARSET=latin1");
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, "INSERT INTO char_conv VALUES (?)", -1);
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO char_conv VALUES (?)"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size);
@@ -743,7 +743,7 @@ static int test_char_conv2(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "SELECT a from char_conv", -1);
rc= mysql_stmt_prepare(stmt, SL("SELECT a from char_conv"));
check_stmt_rc(rc, stmt);
memset(&bind_out, 0, sizeof(MYSQL_BIND));
@@ -813,7 +813,7 @@ static int bulk_skip_row(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "INSERT INTO bulk_example2 VALUES (?,?,?)", -1);
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO bulk_example2 VALUES (?,?,?)"));
check_stmt_rc(rc, stmt);
memset(bind, 0, sizeof(MYSQL_BIND) * 3);

36
unittest/libmariadb/charset.c
View File

@@ -169,20 +169,20 @@ static int test_conversion(MYSQL *mysql)
ulong length;
stmt_text= "DROP TABLE IF EXISTS t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "CREATE TABLE t1 (a TEXT) DEFAULT CHARSET latin1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "SET character_set_connection=utf8, character_set_client=utf8, "
" character_set_results=latin1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
stmt_text= "INSERT INTO t1 (a) VALUES (?)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -200,7 +200,7 @@ static int test_conversion(MYSQL *mysql)
check_stmt_rc(rc, stmt);
stmt_text= "SELECT a FROM t1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -217,10 +217,10 @@ static int test_conversion(MYSQL *mysql)
mysql_stmt_close(stmt);
stmt_text= "DROP TABLE t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "SET NAMES DEFAULT";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
return OK;
@@ -299,7 +299,7 @@ static int test_ps_i18n(MYSQL *mysql)
ulong buf1_len, buf2_len;
stmt_text= "DROP TABLE IF EXISTS t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
/*
@@ -309,14 +309,14 @@ static int test_ps_i18n(MYSQL *mysql)
*/
stmt_text= "CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "SET CHARACTER_SET_CLIENT=koi8r, "
"CHARACTER_SET_CONNECTION=cp1251, "
"CHARACTER_SET_RESULTS=koi8r";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
memset(bind_array, '\0', sizeof(bind_array));
@@ -333,7 +333,7 @@ static int test_ps_i18n(MYSQL *mysql)
stmt_text= "INSERT INTO t1 (c1, c2) VALUES (?, ?)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
mysql_stmt_bind_param(stmt, bind_array);
check_stmt_rc(rc, stmt);
@@ -345,7 +345,7 @@ static int test_ps_i18n(MYSQL *mysql)
stmt_text= "SELECT c1, c2 FROM t1";
/* c1 and c2 are binary so no conversion will be done on select */
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -370,7 +370,7 @@ static int test_ps_i18n(MYSQL *mysql)
FAIL_UNLESS(rc == MYSQL_NO_DATA, "rc != MYSQL_NO_DATA");
stmt_text= "DROP TABLE IF EXISTS t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
/*
@@ -383,12 +383,12 @@ static int test_ps_i18n(MYSQL *mysql)
stmt_text= "CREATE TABLE t1 (c1 VARCHAR(255) CHARACTER SET cp1251, "
"c2 VARCHAR(255) CHARACTER SET cp1251)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "INSERT INTO t1 (c1, c2) VALUES (?, ?)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
/* this data must be converted */
bind_array[0].buffer_type= MYSQL_TYPE_STRING;
@@ -425,7 +425,7 @@ static int test_ps_i18n(MYSQL *mysql)
stmt_text= "SELECT c1, c2 FROM t1";
/* c1 and c2 are binary so no conversion will be done on select */
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -450,10 +450,10 @@ static int test_ps_i18n(MYSQL *mysql)
mysql_stmt_close(stmt);
stmt_text= "DROP TABLE t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "SET NAMES DEFAULT";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
return OK;
}

66
unittest/libmariadb/cursor.c
View File

@@ -45,7 +45,7 @@ MYSQL_STMT *open_cursor(MYSQL *mysql, const char *query)
const ulong type= (ulong)CURSOR_TYPE_READ_ONLY;
MYSQL_STMT *stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
if (rc) {
diag("Error: %s", mysql_stmt_error(stmt));
return NULL;
@@ -73,7 +73,7 @@ int stmt_fetch_init(MYSQL *mysql, Stmt_fetch *fetch, unsigned int stmt_no_arg,
fetch->handle= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(fetch->handle, fetch->query, (unsigned long)strlen(fetch->query));
rc= mysql_stmt_prepare(fetch->handle, SL(fetch->query));
FAIL_IF(rc, mysql_stmt_error(fetch->handle));
/*
@@ -359,7 +359,7 @@ static int test_bug10729(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*) &type);
check_stmt_rc(rc, stmt);
stmt_text= "select name from t1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -415,7 +415,7 @@ static int test_bug10736(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*) &type);
check_stmt_rc(rc, stmt);
stmt_text= "select name from t1 where name=(select name from t1 where id=2)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -463,7 +463,7 @@ static int test_bug10794(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
stmt_text= "insert into t1 (id, name) values (?, ?)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -483,7 +483,7 @@ static int test_bug10794(MYSQL *mysql)
check_stmt_rc(rc, stmt);
}
stmt_text= "select name from t1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
type= (ulong) CURSOR_TYPE_READ_ONLY;
mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*) &type);
stmt1= mysql_stmt_init(mysql);
@@ -503,7 +503,7 @@ static int test_bug10794(MYSQL *mysql)
mysql_stmt_free_result(stmt);
mysql_stmt_reset(stmt);
stmt_text= "select name from t1 where id=10";
rc= mysql_stmt_prepare(stmt1, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt1, SL(stmt_text));
check_stmt_rc(rc, stmt1);
rc= mysql_stmt_bind_result(stmt1, my_bind);
check_stmt_rc(rc, stmt1);
@@ -568,7 +568,7 @@ static int test_bug10760(MYSQL *mysql)
con1: insert into t1 (id) values (1)
*/
stmt_text= "select id from t1 order by 1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);;
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);;
@@ -594,7 +594,7 @@ static int test_bug10760(MYSQL *mysql)
if (check_variable(mysql, "@@have_innodb", "YES"))
{
stmt_text= "select id from t1 order by 1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);;
rc= mysql_query(mysql, "alter table t1 engine=InnoDB");
@@ -648,7 +648,7 @@ static int test_bug11172(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
stmt_text= "SELECT id, hired FROM t1 WHERE hired=?";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
type= (ulong) CURSOR_TYPE_READ_ONLY;
@@ -716,7 +716,7 @@ static int test_bug11656(MYSQL *mysql)
"where server in (?, ?)";
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
type= (ulong) CURSOR_TYPE_READ_ONLY;
mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*) &type);
@@ -761,7 +761,7 @@ static int test_bug11901(MYSQL *mysql)
stmt_text= "drop table if exists t1, t2";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "create table t1 ("
@@ -771,7 +771,7 @@ static int test_bug11901(MYSQL *mysql)
" bonus float not null, primary key (empno), "
" unique key (workdept, empno) "
") default charset=latin1 collate=latin1_bin";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "insert into t1 values "
@@ -808,7 +808,7 @@ static int test_bug11901(MYSQL *mysql)
"(330, 'WING', '', 'LEE', 'E21', 25370, 500), "
"(340, 'JASON', 'R', 'GOUNOT', 'E21', 23840, 500)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "create table t2 ("
@@ -817,7 +817,7 @@ static int test_bug11901(MYSQL *mysql)
" admrdept varchar(6) not null, refcntd int(11) not null,"
" refcntu int(11) not null, primary key (deptno)"
") default charset=latin1 collate=latin1_bin";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "insert into t2 values "
@@ -830,7 +830,7 @@ static int test_bug11901(MYSQL *mysql)
"('E01', 'SUPPORT SERVICES', 50, '', 'A00', 0, 0), "
"('E11', 'OPERATIONS', 90, '', 'E01', 0, 0), "
"('E21', 'SOFTWARE SUPPORT', 100,'', 'E01', 0, 0)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "select t1.empno, t1.workdept "
@@ -842,7 +842,7 @@ static int test_bug11901(MYSQL *mysql)
"order by 1";
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*) &type);
check_stmt_rc(rc, stmt);
@@ -907,7 +907,7 @@ static int test_bug11904(MYSQL *mysql)
stmt_text= "SELECT id, MIN(name) FROM bug11904b GROUP BY id ORDER BY id";
rc= mysql_stmt_prepare(stmt1, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt1, SL(stmt_text));
check_stmt_rc(rc, stmt1);
memset(my_bind, 0, sizeof(my_bind));
@@ -986,14 +986,14 @@ static int test_bug12243(MYSQL *mysql)
stmt_text= "select a from t1";
rc= mysql_stmt_prepare(stmt1, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt1, SL(stmt_text));
check_stmt_rc(rc, stmt1);
rc= mysql_stmt_execute(stmt1);
check_stmt_rc(rc, stmt1);
rc= mysql_stmt_fetch(stmt1);
check_stmt_rc(rc, stmt1);
rc= mysql_stmt_prepare(stmt2, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt2, SL(stmt_text));
check_stmt_rc(rc, stmt2);
rc= mysql_stmt_execute(stmt2);
check_stmt_rc(rc, stmt2);
@@ -1032,7 +1032,7 @@ static int test_bug11909(MYSQL *mysql)
stmt_text= "drop table if exists t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "create table t1 ("
@@ -1041,7 +1041,7 @@ static int test_bug11909(MYSQL *mysql)
" workdept varchar(6) not null, salary double not null,"
" bonus float not null, primary key (empno)"
") default charset=latin1 collate=latin1_bin";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "insert into t1 values "
@@ -1050,7 +1050,7 @@ static int test_bug11909(MYSQL *mysql)
"(30, 'SALLY', 'A', 'KWAN', 'C01', 38250, 800),"
"(50, 'JOHN', 'B', 'GEYER', 'E01', 40175, 800), "
"(60, 'IRVING', 'F', 'STERN', 'D11', 32250, 500)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
/* ****** Begin of trace ****** */
@@ -1059,7 +1059,7 @@ static int test_bug11909(MYSQL *mysql)
"workdept, salary, bonus FROM t1 ORDER BY empno";
stmt1= mysql_stmt_init(mysql);
FAIL_IF(!stmt1, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt1, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt1, SL(stmt_text));
check_stmt_rc(rc, stmt1);
mysql_stmt_attr_set(stmt1, STMT_ATTR_CURSOR_TYPE,
(const void*) &type);
@@ -1112,7 +1112,7 @@ static int test_bug11909(MYSQL *mysql)
stmt_text = "SELECT empno, firstname FROM t1";
stmt2= mysql_stmt_init(mysql);
FAIL_IF(!stmt2, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt2, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt2, SL(stmt_text));
check_stmt_rc(rc, stmt2);
mysql_stmt_attr_set(stmt2, STMT_ATTR_CURSOR_TYPE,
(const void*) &type);
@@ -1185,7 +1185,7 @@ static int test_bug13488(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt1,STMT_ATTR_CURSOR_TYPE, (const void *)&type);
check_stmt_rc(rc, stmt1);
rc= mysql_stmt_prepare(stmt1, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt1, SL(query));
check_stmt_rc(rc, stmt1);
rc= mysql_stmt_execute(stmt1);
@@ -1240,7 +1240,7 @@ static int test_bug13524(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*) &type);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1300,7 +1300,7 @@ static int test_bug14845(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*) &type);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1357,7 +1357,7 @@ static int test_bug14210(MYSQL *mysql)
stmt_text= "select a from t1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
while ((rc= mysql_stmt_fetch(stmt)) == 0);
@@ -1497,7 +1497,7 @@ static int test_bug38486(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*)&type);
check_stmt_rc(rc, stmt);
stmt_text= "CREATE TABLE t1 (a INT)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
mysql_stmt_close(stmt);
@@ -1506,7 +1506,7 @@ static int test_bug38486(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*)&type);
check_stmt_rc(rc, stmt);
stmt_text= "INSERT INTO t1 VALUES (1)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -1558,7 +1558,7 @@ static int test_bug9159(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
mysql_stmt_prepare(stmt, SL(stmt_text));
mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void *)&type);
mysql_stmt_execute(stmt);
@@ -1775,7 +1775,7 @@ static int test_bug9643(MYSQL *mysql)
(void*) &prefetch_rows);
check_stmt_rc(rc, stmt);
stmt_text= "select * from t1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));

8
unittest/libmariadb/errors.c
View File

@@ -50,7 +50,7 @@ static int test_ps_client_warnings(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query,(unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
FAIL_IF(rc, mysql_stmt_error(stmt));
rc= mysql_stmt_execute(stmt);
@@ -115,7 +115,7 @@ static int test_ps_client_errors(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query,(unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
FAIL_IF(rc, mysql_stmt_error(stmt));
rc= mysql_stmt_execute(stmt);
@@ -244,12 +244,12 @@ static int test_parse_error_and_bad_length(MYSQL *mysql)
rc= mysql_query(mysql, "SHOW DATABAAAA");
FAIL_UNLESS(rc, "Error expected");
rc= mysql_real_query(mysql, "SHOW DATABASES\0AAA", 18);
rc= mysql_real_query(mysql, SL_BIN("SHOW DATABASES\0AAA"));
FAIL_UNLESS(rc, "Error expected");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SHOW DATABAAAA", (unsigned long)strlen("SHOW DATABAAAA"));
rc= mysql_stmt_prepare(stmt, SL("SHOW DATABAAAA"));
FAIL_IF(!rc, "Error expected");
mysql_stmt_close(stmt);
stmt= mysql_stmt_init(mysql);

16
unittest/libmariadb/fetch.c
View File

@@ -46,7 +46,7 @@ static int bind_fetch(MYSQL *mysql, int row_count)
FAIL_IF(!stmt, mysql_error(mysql));
strcpy(query, "INSERT INTO test_bind_fetch VALUES (?, ?, ?, ?, ?, ?, ?)");
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc,stmt);
FAIL_UNLESS(mysql_stmt_param_count(stmt) == 7, "ParamCount != 7");
@@ -85,7 +85,7 @@ static int bind_fetch(MYSQL *mysql, int row_count)
FAIL_IF(!stmt, mysql_error(mysql));
strcpy(query, "SELECT * FROM test_bind_fetch");
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc,stmt);
for (i= 0; i < (int) array_elements(my_bind); i++)
@@ -199,7 +199,7 @@ static int test_fetch_seek(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc,stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -286,7 +286,7 @@ static int test_fetch_offset(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)(unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc,stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -408,7 +408,7 @@ static int test_fetch_column(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc,stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -521,7 +521,7 @@ static int test_fetch_nobuffs(MYSQL *mysql)
stmt = mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -612,7 +612,7 @@ static int test_fetch_null(MYSQL *mysql)
stmt = mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_result(stmt, my_bind);
@@ -728,7 +728,7 @@ static int test_fetch_date(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_result(stmt, my_bind);

6
unittest/libmariadb/logs.c
View File

@@ -78,7 +78,7 @@ static int test_logs(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, data, (unsigned long)strlen(data));
rc= mysql_stmt_prepare(stmt, SL(data));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -129,7 +129,7 @@ static int test_logs(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, data, (unsigned long)strlen(data));
rc= mysql_stmt_prepare(stmt, SL(data));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -144,7 +144,7 @@ static int test_logs(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, data, (unsigned long)strlen(data));
rc= mysql_stmt_prepare(stmt, SL(data));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, my_bind);

14
unittest/libmariadb/misc.c
View File

@@ -248,7 +248,7 @@ static int test_frm_bug(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "show variables like 'datadir'", (unsigned long)strlen("show variables like 'datadir'"));
rc= mysql_stmt_prepare(stmt, SL("show variables like 'datadir'"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -341,7 +341,7 @@ static int test_wl4166_1(MYSQL *mysql)
FAIL_IF(!stmt, mysql_error(mysql));
query= "INSERT INTO table_4166(col1, col2, col3, col4, col5, col6, col7) "
"VALUES(?, ?, ?, ?, ?, ?, ?)";
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 7, "param_count != 7");
@@ -453,7 +453,7 @@ static int test_wl4166_2(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "select * from t1", (unsigned long)strlen("select * from t1"));
rc= mysql_stmt_prepare(stmt, SL("select * from t1"));
check_stmt_rc(rc, stmt);
memset(bind_out, '\0', sizeof(bind_out));
@@ -552,7 +552,7 @@ static int test_wl4166_3(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "insert into t1 (year) values (?)", (unsigned long)strlen("insert into t1 (year) values (?)"));
rc= mysql_stmt_prepare(stmt, SL("insert into t1 (year) values (?)"));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "param_count != 1");
@@ -644,7 +644,7 @@ static int test_wl4166_4(MYSQL *mysql)
stmt_text= "insert into t1 (c1, c2) values (?, ?)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
mysql_stmt_bind_param(stmt, bind_array);
@@ -661,7 +661,7 @@ static int test_wl4166_4(MYSQL *mysql)
stmt_text= "select c1, c2 from t1";
/* c1 and c2 are binary so no conversion will be done on select */
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1272,7 +1272,7 @@ static int test_wl6797(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
stmt_text= "INSERT INTO t1 VALUES (1), (2)";
rc= mysql_stmt_prepare(stmt, stmt_text, (ulong)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_mysql_rc(rc, mysql);
/* Execute the insert statement */

3
unittest/libmariadb/my_test.h
View File

@@ -55,6 +55,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define MAX_KEY MAX_INDEXES
#define MAX_KEY_LENGTH_DECIMAL_WIDTH 4 /* strlen("4096") */
#define SL(s) (s), (unsigned long)strlen((s))
#define SL_BIN(s) (s), (unsigned long)sizeof((s))
#define MAX_TEST_QUERY_LENGTH 300 /* MAX QUERY BUFFER LENGTH */
/* prevent warnings on Win64 by using STMT_LEN instead of strlen */

2
unittest/libmariadb/performance.c
View File

@@ -39,7 +39,7 @@ static int perf1(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
diag("prepare");
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt, SL(stmtstr));
check_stmt_rc(rc, stmt);
diag("execute");

251
unittest/libmariadb/ps.c
View File

@@ -69,7 +69,7 @@ static int test_conc83(MYSQL *unused __attribute__((unused)))
rc= mysql_ping(mysql);
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, query, -1);
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
diag("Ok");
@@ -96,7 +96,7 @@ static int test_conc60(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (void *)&x);
rc= mysql_stmt_prepare(stmt, query, -1);
rc= mysql_stmt_prepare(stmt, SL(query));
if (rc && mysql_stmt_errno(stmt) == 1146) {
diag("Internal test - customer data not available");
mysql_stmt_close(stmt);
@@ -146,7 +146,7 @@ static int test_prepare_insert_update(MYSQL *mysql)
strcpy(query, *cur_query);
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 0, "Paramcount is not 0");
@@ -190,7 +190,7 @@ static int test_bind_date_conv(MYSQL *mysql, uint row_count)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "INSERT INTO test_date VALUES(?, ?, ?, ?)", -1); //strlen("INSERT INTO test_date VALUES(?, ?, ?, ?)"));
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO test_date VALUES(?, ?, ?, ?)"));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 4, "param_count != 4");
@@ -264,7 +264,7 @@ static int test_bind_date_conv(MYSQL *mysql, uint row_count)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT * FROM test_date", (unsigned long)strlen("SELECT * FROM test_date"));
rc= mysql_stmt_prepare(stmt, SL("SELECT * FROM test_date"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_result(stmt, my_bind);
@@ -320,7 +320,7 @@ static int test_prepare_simple(MYSQL *mysql)
strcpy(query, "INSERT INTO test_prepare_simple VALUES(?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Paramcount is not 2");
@@ -331,7 +331,7 @@ static int test_prepare_simple(MYSQL *mysql)
"WHERE id=? AND CONVERT(name USING utf8)= ?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 3, "Paramcount is not 3");
@@ -341,7 +341,7 @@ static int test_prepare_simple(MYSQL *mysql)
strcpy(query, "DELETE FROM test_prepare_simple WHERE id=10");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 0, "Paramcount is not 0");
@@ -354,7 +354,7 @@ static int test_prepare_simple(MYSQL *mysql)
strcpy(query, "DELETE FROM test_prepare_simple WHERE id=?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "Paramcount != 1");
@@ -366,7 +366,7 @@ static int test_prepare_simple(MYSQL *mysql)
"AND CONVERT(name USING utf8)= ?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Paramcount != 2");
@@ -402,7 +402,7 @@ static int test_prepare_field_result(MYSQL *mysql)
" test_prepare_field_result as t1 WHERE int_c=?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "Paramcount != 1");
@@ -461,12 +461,12 @@ static int test_prepare_syntax(MYSQL *mysql)
strcpy(query, "INSERT INTO test_prepare_syntax VALUES(?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
FAIL_IF(!rc, "error expected");
strcpy(query, "SELECT id, name FROM test_prepare_syntax WHERE id=? AND WHERE");
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
FAIL_IF(!rc, "error expected");
/* now fetch the results ..*/
@@ -512,7 +512,7 @@ static int test_prepare(MYSQL *mysql)
strcpy(query, "INSERT INTO my_prepare VALUES(?, ?, ?, ?, ?, ?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 7, "Paramcount != 7");
@@ -656,7 +656,7 @@ static int test_prepare_multi_statements(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
FAIL_IF(!rc, "Error expected");
mysql_stmt_close(stmt);
@@ -722,7 +722,7 @@ static int test_prepare_ext(MYSQL *mysql)
strcpy(query, "INSERT INTO test_prepare_ext(c1, c2, c3, c4, c5, c6) VALUES(?, ?, ?, ?, ?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 6, "Paramcount != 6");
@@ -771,7 +771,7 @@ static int test_prepare_ext(MYSQL *mysql)
strcpy(query, "SELECT c1, c2, c3, c4, c5, c6 FROM test_prepare_ext");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
/* get the result */
@@ -811,7 +811,7 @@ static int test_prepare_alter(MYSQL *mysql)
strcpy(query, "INSERT INTO test_prep_alter VALUES(?, 'monty')");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "Paramcount != 1");
@@ -872,7 +872,7 @@ static int test_prepare_resultset(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
strcpy(query, "SELECT * FROM test_prepare_resultset");
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt), "Paramcount != 0");
@@ -905,7 +905,7 @@ static int test_open_direct(MYSQL *mysql)
strcpy(query, "INSERT INTO test_open_direct values(10, 'mysql')");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_query(mysql, "SELECT * FROM test_open_direct");
@@ -951,7 +951,7 @@ static int test_open_direct(MYSQL *mysql)
strcpy(query, "SELECT * FROM test_open_direct");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -972,7 +972,7 @@ static int test_open_direct(MYSQL *mysql)
/* run a direct query with store result */
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1013,7 +1013,7 @@ static int test_select_show(MYSQL *mysql)
strcpy(query, "show columns from test_show");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 0, "Paramcount != 0");
@@ -1031,12 +1031,12 @@ static int test_select_show(MYSQL *mysql)
strcpy(query, "show tables from mysql like ?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
FAIL_IF(!rc, "Error expected");
strcpy(query, "show tables like \'test_show\'");
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1051,7 +1051,7 @@ static int test_select_show(MYSQL *mysql)
strcpy(query, "describe test_show");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1066,7 +1066,7 @@ static int test_select_show(MYSQL *mysql)
strcpy(query, "show keys from test_show");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1118,7 +1118,7 @@ static int test_simple_update(MYSQL *mysql)
strcpy(query, "UPDATE test_update SET col2= ? WHERE col1= ?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Paramcount != 2");
@@ -1194,7 +1194,7 @@ static int test_long_data(MYSQL *mysql)
strcpy(query, "INSERT INTO test_long_data(col1, col2) VALUES(?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
FAIL_IF(!rc, "Error expected");
rc= mysql_stmt_close(stmt);
check_stmt_rc(rc, stmt);
@@ -1202,7 +1202,7 @@ static int test_long_data(MYSQL *mysql)
strcpy(query, "INSERT INTO test_long_data(col1, col2, col3) VALUES(?, ?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt)
FAIL_IF(mysql_stmt_param_count(stmt) != 3, "Paramcount != 3");
@@ -1222,10 +1222,10 @@ static int test_long_data(MYSQL *mysql)
data= (char *)"Michael";
/* supply data in pieces */
rc= mysql_stmt_send_long_data(stmt, 1, data, (unsigned long)strlen(data));
rc= mysql_stmt_send_long_data(stmt, 1, SL(data));
check_stmt_rc(rc, stmt);
data= (char *)" 'Monty' Widenius";
rc= mysql_stmt_send_long_data(stmt, 1, data, (unsigned long)strlen(data));
rc= mysql_stmt_send_long_data(stmt, 1, SL(data));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_send_long_data(stmt, 2, "Venu (venu@mysql.com)", 4);
check_stmt_rc(rc, stmt);
@@ -1295,7 +1295,7 @@ static int test_long_data_str(MYSQL *mysql)
strcpy(query, "INSERT INTO test_long_data_str VALUES(?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt)
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Paramcount != 2");
@@ -1394,7 +1394,7 @@ static int test_long_data_str1(MYSQL *mysql)
strcpy(query, "INSERT INTO test_long_data_str VALUES(?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt)
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Paramcount != 2");
@@ -1464,7 +1464,7 @@ static int test_long_data_str1(MYSQL *mysql)
strcpy(query, "SELECT * from test_long_data_str");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt)
FAIL_IF(mysql_stmt_param_count(stmt) != 0, "Paramcount != 0");
@@ -1559,7 +1559,7 @@ static int test_long_data_bin(MYSQL *mysql)
strcpy(query, "INSERT INTO test_long_data_bin VALUES(?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt)
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Paramcount != 2");
@@ -1652,7 +1652,7 @@ static int test_simple_delete(MYSQL *mysql)
"CONVERT(col2 USING utf8)= ? AND col3= 100");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt)
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Paramcount != 2");
@@ -1728,7 +1728,7 @@ static int test_update(MYSQL *mysql)
strcpy(query, "INSERT INTO test_update(col2, col3) VALUES(?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Paramcount != 2");
@@ -1758,7 +1758,7 @@ static int test_update(MYSQL *mysql)
strcpy(query, "UPDATE test_update SET col2= ? WHERE col3= ?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Paramcount != 2");
@@ -1828,7 +1828,7 @@ static int test_prepare_noparam(MYSQL *mysql)
strcpy(query, "INSERT INTO my_prepare VALUES(10, 'venu')");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 0, "Paramcount != 0");
@@ -1909,7 +1909,7 @@ static int test_bind_result(MYSQL *mysql)
strcpy(query, "SELECT * FROM test_bind_result");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_result(stmt, my_bind);
@@ -2023,7 +2023,7 @@ static int test_bind_result_ext(MYSQL *mysql)
strcpy(query, "select * from test_bind_result");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_result(stmt, my_bind);
@@ -2142,7 +2142,7 @@ static int test_bind_result_ext1(MYSQL *mysql)
strcpy(query, "select * from test_bind_result");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_result(stmt, my_bind);
@@ -2200,7 +2200,7 @@ static int test_bind_negative(MYSQL *mysql)
query= (char*)"INSERT INTO t1 VALUES (?)";
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
/* bind parameters */
@@ -2248,7 +2248,7 @@ static int test_buffers(MYSQL *mysql)
strcpy(query, "select str from test_buffer");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -2351,7 +2351,7 @@ static int test_xjoin(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
for (i= 0; i < 3; i++)
@@ -2386,7 +2386,7 @@ static int test_union_param(MYSQL *mysql)
query= (char*)"select ? as my_col union distinct select ?";
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
/*
@@ -2464,7 +2464,7 @@ static int test_union(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -2500,7 +2500,7 @@ static int test_union2(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
for (i= 0; i < 3; i++)
@@ -2539,14 +2539,14 @@ static int test_pure_coverage(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "insert into test_pure(c67788) values(10)", (unsigned long)strlen("insert into test_pure(c67788) values(10)"));
rc= mysql_stmt_prepare(stmt, SL("insert into test_pure(c67788) values(10)"));
FAIL_IF(!rc, "Error expected");
mysql_stmt_close(stmt);
/* Query without params and result should allow to bind 0 arrays */
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "insert into test_pure(c2) values(10)", (unsigned long)strlen("insert into test_pure(c2) values(10)"));
rc= mysql_stmt_prepare(stmt, SL("insert into test_pure(c2) values(10)"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, (MYSQL_BIND*)0);
@@ -2560,7 +2560,7 @@ static int test_pure_coverage(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "insert into test_pure(c2) values(?)", (unsigned long)strlen("insert into test_pure(c2) values(?)"));
rc= mysql_stmt_prepare(stmt, SL("insert into test_pure(c2) values(?)"));
check_stmt_rc(rc, stmt);
/*
@@ -2585,7 +2585,7 @@ static int test_pure_coverage(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "select * from test_pure", (unsigned long)strlen("select * from test_pure"));
rc= mysql_stmt_prepare(stmt, SL("select * from test_pure"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -2617,13 +2617,13 @@ static int test_insert_select(MYSQL *mysql)
query= (char*)"insert into t1 select a from t2";
stmt_insert= mysql_stmt_init(mysql);
FAIL_IF(!stmt_insert, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_insert, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_insert, SL(query));
check_stmt_rc(rc, stmt_insert);
query= (char*)"select * from t1";
stmt_select= mysql_stmt_init(mysql);
FAIL_IF(!stmt_select, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_select, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_select, SL(query));
check_stmt_rc(rc, stmt_select);
for(i= 0; i < 3; i++)
@@ -2672,8 +2672,7 @@ static int test_insert(MYSQL *mysql)
/* insert by prepare */
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "INSERT INTO test_prep_insert VALUES(?, ?)",
(unsigned long)strlen("INSERT INTO test_prep_insert VALUES(?, ?)"));
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO test_prep_insert VALUES(?, ?)"));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Param_count != 2");
@@ -2767,7 +2766,7 @@ static int test_join(MYSQL *mysql)
{
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query[j], (unsigned long)strlen(query[j]));
rc= mysql_stmt_prepare(stmt, SL(query[j]));
check_stmt_rc(rc, stmt);
for (i= 0; i < 3; i++)
{
@@ -2806,7 +2805,7 @@ static int test_left_join_view(MYSQL *mysql)
rc= mysql_query(mysql,"create view v1 (x) as select a from t1 where a > 1");
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
for (i= 0; i < 3; i++)
@@ -2861,7 +2860,7 @@ static int test_manual_sample(MYSQL *mysql)
strcpy(query, "INSERT INTO test_table(col1, col2, col3) values(?, ?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
/* Get the parameter count from the statement */
@@ -2950,19 +2949,19 @@ static int test_create_drop(MYSQL *mysql)
query= (char*)"create table t1 (a int)";
stmt_create= mysql_stmt_init(mysql);
FAIL_IF(!stmt_create, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_create, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_create, SL(query));
check_stmt_rc(rc, stmt_create);
query= (char*)"drop table t1";
stmt_drop= mysql_stmt_init(mysql);
FAIL_IF(!stmt_drop, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_drop, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_drop, SL(query));
check_stmt_rc(rc, stmt_drop);
query= (char*)"select a in (select a from t2) from t1";
stmt_select= mysql_stmt_init(mysql);
FAIL_IF(!stmt_select, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_select, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_select, SL(query));
check_stmt_rc(rc, stmt_select);
rc= mysql_query(mysql, "DROP TABLE t1");
@@ -2971,7 +2970,7 @@ static int test_create_drop(MYSQL *mysql)
query= (char*)"create table t1 select a from t2";
stmt_create_select= mysql_stmt_init(mysql);
FAIL_IF(!stmt_create_select, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_create_select, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_create_select, SL(query));
check_stmt_rc(rc, stmt_create_select);
for (i= 0; i < 3; i++)
@@ -3139,18 +3138,18 @@ static int test_datetime_ranges(MYSQL *mysql)
return SKIP;
stmt_text= "drop table if exists t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "create table t1 (year datetime, month datetime, day datetime, "
"hour datetime, min datetime, sec datetime)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
stmt_text= "INSERT INTO t1 VALUES (?, ?, ?, ?, ?, ?)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 6, "param_count != 6");
@@ -3192,13 +3191,13 @@ static int test_datetime_ranges(MYSQL *mysql)
mysql_stmt_close(stmt);
stmt_text= "delete from t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "INSERT INTO t1 (year, month, day) VALUES (?, ?, ?)";
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
/*
@@ -3224,17 +3223,17 @@ static int test_datetime_ranges(MYSQL *mysql)
mysql_stmt_close(stmt);
stmt_text= "drop table t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "create table t1 (day_ovfl time, day time, hour time, min time, sec time)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
stmt_text= "INSERT INTO t1 VALUES (?,?,?,?,?)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 5, "param_count != 5");
@@ -3271,13 +3270,13 @@ static int test_datetime_ranges(MYSQL *mysql)
mysql_stmt_close(stmt);
stmt_text= "drop table t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
return OK;
error:
mysql_stmt_close(stmt);
stmt_text= "drop table t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
return OK;
}
@@ -3306,7 +3305,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -3358,7 +3357,7 @@ static int test_distinct(MYSQL *mysql)
{
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -3390,13 +3389,13 @@ static int test_do_set(MYSQL *mysql)
query= (char*)"do @var:=(1 in (select * from t1))";
stmt_do= mysql_stmt_init(mysql);
FAIL_IF(!stmt_do, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_do, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_do, SL(query));
check_stmt_rc(rc, stmt_do);
query= (char*)"set @var=(1 in (select * from t1))";
stmt_set= mysql_stmt_init(mysql);
FAIL_IF(!stmt_set, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_set, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_set, SL(query));
check_stmt_rc(rc, stmt_set);
for (i= 0; i < 3; i++)
@@ -3442,7 +3441,7 @@ static int test_double_compare(MYSQL *mysql)
"WHERE col1 = ? AND col2 = ? AND COL3 = ?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 3, "param_count != 3");
@@ -3536,25 +3535,25 @@ static int test_multi(MYSQL *mysql)
query= (char*)"delete t1, t2 from t1, t2 where t1.a=t2.a and t1.b=10";
stmt_delete= mysql_stmt_init(mysql);
FAIL_IF(!stmt_delete, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_delete, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_delete, SL(query));
check_stmt_rc(rc, stmt_delete);
query= (char*)"update t1, t2 set t1.b=10, t2.b=10 where t1.a=t2.a and t1.b=?";
stmt_update= mysql_stmt_init(mysql);
FAIL_IF(!stmt_update, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_update, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_update, SL(query));
check_stmt_rc(rc, stmt_update);
query= (char*)"select * from t1";
stmt_select1= mysql_stmt_init(mysql);
FAIL_IF(!stmt_select1, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_select1, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_select1, SL(query));
check_stmt_rc(rc, stmt_select1);
query= (char*)"select * from t2";
stmt_select2= mysql_stmt_init(mysql);
FAIL_IF(!stmt_select2, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_select2, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_select2, SL(query));
check_stmt_rc(rc, stmt_select2);
for(i= 0; i < 3; i++)
@@ -3621,13 +3620,13 @@ static int test_multi_stmt(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
query= "SELECT * FROM test_multi_table WHERE id=?";
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
stmt2= mysql_stmt_init(mysql);
FAIL_IF(!stmt2, mysql_error(mysql));
query= "UPDATE test_multi_table SET name='updated' WHERE id=10";
rc= mysql_stmt_prepare(stmt2, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt2, SL(query));
check_stmt_rc(rc, stmt2);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "param_count != 1");
@@ -3671,7 +3670,7 @@ static int test_multi_stmt(MYSQL *mysql)
stmt1= mysql_stmt_init(mysql);
FAIL_IF(!stmt1, mysql_error(mysql));
query= "DELETE FROM test_multi_table WHERE id=? AND CONVERT(name USING utf8)=?";
rc= mysql_stmt_prepare(stmt1, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt1, SL(query));
check_stmt_rc(rc, stmt1);
FAIL_IF(mysql_stmt_param_count(stmt1) != 2, "param_count != 2");
@@ -3748,7 +3747,7 @@ static int test_nstmts(MYSQL *mysql)
strcpy(query, "insert into test_nstmts values(?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, my_bind);
@@ -3762,7 +3761,7 @@ static int test_nstmts(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, " select count(*) from test_nstmts", (unsigned long)strlen(" select count(*) from test_nstmts"));
rc= mysql_stmt_prepare(stmt, SL(" select count(*) from test_nstmts"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3808,14 +3807,14 @@ static int test_null(MYSQL *mysql)
strcpy(query, "INSERT INTO test_null(col3, col2) VALUES(?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
FAIL_IF(!rc, "Error expected");
mysql_stmt_close(stmt);
strcpy(query, "INSERT INTO test_null(col1, col2) VALUES(?, ?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "param_count != 2");
@@ -3871,7 +3870,7 @@ static int test_null(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT * FROM test_null", (unsigned long)strlen("SELECT * FROM test_null"));
rc= mysql_stmt_prepare(stmt, SL("SELECT * FROM test_null"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3913,7 +3912,7 @@ static int test_order_param(MYSQL *mysql)
query= "select sum(a) + 200, 1 from t1 "
" union distinct "
"select sum(a) + 200, 1 from t1 group by b ";
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt);
@@ -3922,7 +3921,7 @@ static int test_order_param(MYSQL *mysql)
query= "select sum(a) + 200, ? from t1 group by b "
" union distinct "
"select sum(a) + 200, 1 from t1 group by b ";
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt);
@@ -3931,7 +3930,7 @@ static int test_order_param(MYSQL *mysql)
query= "select sum(a) + 200, ? from t1 "
" union distinct "
"select sum(a) + 200, 1 from t1 group by b ";
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt);
@@ -3951,7 +3950,7 @@ static int test_rename(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_query(mysql, "create table t1 (a int)");
@@ -3993,15 +3992,15 @@ static int test_rewind(MYSQL *mysql)
stmt_text= "CREATE TABLE t1 (a int)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "INSERT INTO t1 VALUES(2),(3),(4)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
stmt_text= "SELECT * FROM t1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
memset(&my_bind, '\0', sizeof(MYSQL_BIND));
@@ -4033,7 +4032,7 @@ static int test_rewind(MYSQL *mysql)
FAIL_UNLESS(rc == MYSQL_NO_DATA, "rc != MYSQL_NO_DATA");
stmt_text= "DROP TABLE t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
rc= mysql_stmt_free_result(stmt);
rc= mysql_stmt_close(stmt);
@@ -4077,7 +4076,7 @@ static int test_select(MYSQL *mysql)
"AND CONVERT(name USING utf8) =?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "param_count != 2");
@@ -4139,7 +4138,7 @@ static int test_select_prepare(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT * FROM test_select", (unsigned long)strlen("SELECT * FROM test_select"));
rc= mysql_stmt_prepare(stmt, SL("SELECT * FROM test_select"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4168,7 +4167,7 @@ static int test_select_prepare(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT * FROM test_select", (unsigned long)strlen("SELECT * FROM test_select"));
rc= mysql_stmt_prepare(stmt, SL("SELECT * FROM test_select"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4193,7 +4192,7 @@ static int test_select_show_table(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SHOW TABLES FROM mysql", (unsigned long)strlen("SHOW TABLES FROM mysql"));
rc= mysql_stmt_prepare(stmt, SL("SHOW TABLES FROM mysql"));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt), "param_count != 0");
@@ -4219,7 +4218,7 @@ static int test_select_version(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT @@version", (unsigned long)strlen("SELECT @@version"));
rc= mysql_stmt_prepare(stmt, SL("SELECT @@version"));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt), "param_count != 0");
@@ -4264,7 +4263,7 @@ static int test_selecttmp(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
for (i= 0; i < 3; i++)
{
@@ -4318,7 +4317,7 @@ static int test_set_option(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT * FROM test_limit", (unsigned long)strlen("SELECT * FROM test_limit"));
rc= mysql_stmt_prepare(stmt, SL("SELECT * FROM test_limit"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4337,7 +4336,7 @@ static int test_set_option(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT * FROM test_limit", (unsigned long)strlen("SELECT * FROM test_limit"));
rc= mysql_stmt_prepare(stmt, SL("SELECT * FROM test_limit"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4370,7 +4369,7 @@ static int test_set_variable(MYSQL *mysql)
stmt1= mysql_stmt_init(mysql);
FAIL_IF(!stmt1, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt1, "show variables like 'max_error_count'", (unsigned long)strlen("show variables like 'max_error_count'"));
rc= mysql_stmt_prepare(stmt1, SL("show variables like 'max_error_count'"));
check_stmt_rc(rc, stmt1);
memset(get_bind, '\0', sizeof(get_bind));
@@ -4401,7 +4400,7 @@ static int test_set_variable(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "set max_error_count=?", (unsigned long)strlen("set max_error_count=?"));
rc= mysql_stmt_prepare(stmt, SL("set max_error_count=?"));
check_stmt_rc(rc, stmt);
memset(set_bind, '\0', sizeof(set_bind));
@@ -4476,7 +4475,7 @@ static int test_sqlmode(MYSQL *mysql)
strcpy(query, "INSERT INTO test_piping VALUES(?||?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -4506,7 +4505,7 @@ static int test_sqlmode(MYSQL *mysql)
strcpy(query, "SELECT connection_id ()");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt);
@@ -4518,7 +4517,7 @@ static int test_sqlmode(MYSQL *mysql)
strcpy(query, "INSERT INTO test_piping VALUES(?||?)");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, my_bind);
@@ -4542,7 +4541,7 @@ static int test_sqlmode(MYSQL *mysql)
strcpy(query, "SELECT connection_id ()");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4564,7 +4563,7 @@ static int test_sqlmode(MYSQL *mysql)
strcpy(query, "SELECT connection_id ()");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4608,7 +4607,7 @@ static int test_stmt_close(MYSQL *mysql)
strcpy(query, "DO \"nothing\"");
stmt1= mysql_stmt_init(mysql);
FAIL_IF(!stmt1, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt1, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt1, SL(query));
check_stmt_rc(rc, stmt1);
FAIL_IF(mysql_stmt_param_count(stmt1), "param_count != 0");
@@ -4616,7 +4615,7 @@ static int test_stmt_close(MYSQL *mysql)
strcpy(query, "INSERT INTO test_stmt_close(id) VALUES(?)");
stmt_x= mysql_stmt_init(mysql);
FAIL_IF(!stmt_x, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt_x, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt_x, SL(query));
check_stmt_rc(rc, stmt_x);
FAIL_IF(mysql_stmt_param_count(stmt_x) != 1, "param_count != 1");
@@ -4624,7 +4623,7 @@ static int test_stmt_close(MYSQL *mysql)
strcpy(query, "UPDATE test_stmt_close SET id= ? WHERE id= ?");
stmt3= mysql_stmt_init(mysql);
FAIL_IF(!stmt3, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt3, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt3, SL(query));
check_stmt_rc(rc, stmt3);
FAIL_IF(mysql_stmt_param_count(stmt3) != 2, "param_count != 2");
@@ -4632,7 +4631,7 @@ static int test_stmt_close(MYSQL *mysql)
strcpy(query, "SELECT * FROM test_stmt_close WHERE id= ?");
stmt2= mysql_stmt_init(mysql);
FAIL_IF(!stmt2, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt2, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt2, SL(query));
check_stmt_rc(rc, stmt2);
FAIL_IF(mysql_stmt_param_count(stmt2) != 1, "param_count != 1");
@@ -4759,7 +4758,7 @@ static int test_long_data1(MYSQL *mysql)
strcpy(query, "UPDATE tld SET col2=? WHERE col1=1");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
memset(bind, 0, sizeof(MYSQL_BIND));
bind[0].buffer_type= MYSQL_TYPE_STRING;
@@ -4790,7 +4789,7 @@ int test_blob_9000(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
memset(bind, 0, sizeof(MYSQL_BIND));
memset(buffer, 'C', 9200);
@@ -4817,7 +4816,7 @@ int test_fracseconds(MYSQL *mysql)
MYSQL_BIND bind[2];
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, str, (unsigned long)strlen(str));
rc= mysql_stmt_prepare(stmt, SL(str));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4893,7 +4892,7 @@ int test_notrunc(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4941,7 +4940,7 @@ static int test_bit2tiny(MYSQL *mysql)
mysql_query(mysql, "INSERT INTO justbit values (1)");
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
memset(bind, '\0', sizeof(bind));
@@ -5054,19 +5053,19 @@ static int test_prepare_error(MYSQL *mysql)
MYSQL_STMT *stmt= mysql_stmt_init(mysql);
int rc;
rc= mysql_stmt_prepare(stmt, "SELECT 1 FROM tbl_not_exists", -1);
rc= mysql_stmt_prepare(stmt, SL("SELECT 1 FROM tbl_not_exists"));
FAIL_IF(!rc, "Expected error");
rc= mysql_stmt_reset(stmt);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_prepare(stmt, "SELECT 1 FROM tbl_not_exists", -1);
rc= mysql_stmt_prepare(stmt, SL("SELECT 1 FROM tbl_not_exists"));
FAIL_IF(!rc, "Expected error");
rc= mysql_stmt_reset(stmt);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_prepare(stmt, "SET @a:=1", -1);
rc= mysql_stmt_prepare(stmt, SL("SET @a:=1"));
check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt);

235
unittest/libmariadb/ps_bugs.c
View File

@@ -62,7 +62,7 @@ static int test_conc67(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_PREFETCH_ROWS, &prefetch_rows);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
memset(&rbind, 0, sizeof(MYSQL_BIND));
@@ -152,7 +152,7 @@ session_id char(9) NOT NULL, \
"CONVERT(session_id USING utf8)= ?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "Paramcount != 1");
@@ -244,7 +244,7 @@ static int test_bug1180(MYSQL *mysql)
"session_id= \"abc\"");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "Paramcount != 1");
@@ -343,7 +343,7 @@ static int test_bug1644(MYSQL *mysql)
strcpy(query, "INSERT INTO foo_dfr VALUES (?, ?, ?, ? )");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 4, "Paramcount != 4");
@@ -444,7 +444,7 @@ static int test_bug11037(MYSQL *mysql)
stmt_text= "select id FROM t1";
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
/* expected error */
@@ -486,7 +486,7 @@ static int test_bug11183(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, bug_statement, (unsigned long)strlen(bug_statement));
rc= mysql_stmt_prepare(stmt, SL(bug_statement));
check_stmt_rc(rc, stmt);
rc= mysql_query(mysql, "drop table t1");
@@ -571,7 +571,7 @@ static int test_bug1500(MYSQL *mysql)
query= "SELECT i FROM test_bg1500 WHERE i IN (?, ?, ?)";
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 3, "paramcount != 3");
@@ -613,7 +613,7 @@ static int test_bug1500(MYSQL *mysql)
query= "SELECT s FROM test_bg1500 WHERE MATCH (s) AGAINST (?)";
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "paramcount != 1");
@@ -642,7 +642,7 @@ static int test_bug1500(MYSQL *mysql)
query= "SELECT s FROM test_bg1500 WHERE MATCH (s) AGAINST (CONCAT(?, 'digger'))";
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "paramcount != 1");
@@ -682,7 +682,7 @@ static int test_bug15510(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -782,7 +782,7 @@ static int test_bug15613(MYSQL *mysql)
/* II. Check SELECT metadata */
stmt_text= ("select t, tt, mt, lt, vl, vb, vu from t1");
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
metadata= mysql_stmt_result_metadata(stmt);
field= mysql_fetch_fields(metadata);
FAIL_UNLESS(field[0].length == 65535, "length != 65535");
@@ -843,7 +843,7 @@ static int test_bug1664(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Param count != 2");
@@ -867,7 +867,7 @@ static int test_bug1664(MYSQL *mysql)
not break following execution.
*/
data= "";
rc= mysql_stmt_send_long_data(stmt, 0, data, (unsigned long)strlen(data));
rc= mysql_stmt_send_long_data(stmt, 0, SL(data));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -881,7 +881,7 @@ static int test_bug1664(MYSQL *mysql)
/* This should pass OK */
data= (char *)"Data";
rc= mysql_stmt_send_long_data(stmt, 0, data, (unsigned long)strlen(data));
rc= mysql_stmt_send_long_data(stmt, 0, SL(data));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -922,7 +922,7 @@ static int test_bug1664(MYSQL *mysql)
*/
data= (char *)"SomeOtherData";
rc= mysql_stmt_send_long_data(stmt, 0, data, (unsigned long)strlen(data));
rc= mysql_stmt_send_long_data(stmt, 0, SL(data));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -941,13 +941,13 @@ static int test_bug1664(MYSQL *mysql)
/* Now let us test how mysql_stmt_reset works. */
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt);
data= (char *)"SomeData";
rc= mysql_stmt_send_long_data(stmt, 0, data, (unsigned long)strlen(data));
rc= mysql_stmt_send_long_data(stmt, 0, SL(data));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_reset(stmt);
@@ -1003,7 +1003,7 @@ static int test_ushort_bug(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1071,10 +1071,10 @@ static int test_bug1946(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_real_query(mysql, query, (unsigned long)strlen(query));
rc= mysql_real_query(mysql, SL(query));
FAIL_IF(!rc, "Error expected");
mysql_stmt_close(stmt);
@@ -1111,7 +1111,7 @@ static int test_bug20152(MYSQL *mysql)
check_mysql_rc(rc, mysql)
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt);
@@ -1149,7 +1149,7 @@ static int test_bug2247(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, insert, (unsigned long)strlen(insert));
rc= mysql_stmt_prepare(stmt, SL(insert));
check_stmt_rc(rc, stmt);
for (i= 0; i < NUM_ROWS; ++i)
{
@@ -1183,7 +1183,7 @@ static int test_bug2247(MYSQL *mysql)
/* check that mysql_stmt_store_result modifies mysql_stmt_affected_rows */
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, SELECT, (unsigned long)strlen(SELECT));
rc= mysql_stmt_prepare(stmt, SL(SELECT));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1222,7 +1222,7 @@ static int test_bug2248(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query1, (unsigned long)strlen(query1));
rc= mysql_stmt_prepare(stmt, SL(query1));
check_stmt_rc(rc, stmt);
/* This should not hang */
@@ -1237,7 +1237,7 @@ static int test_bug2248(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query2, (unsigned long)strlen(query2));
rc= mysql_stmt_prepare(stmt, SL(query2));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -1303,7 +1303,7 @@ static int test_bug23383(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, insert_query, (unsigned long)strlen(insert_query));
rc= mysql_stmt_prepare(stmt, SL(insert_query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -1315,7 +1315,7 @@ static int test_bug23383(MYSQL *mysql)
row_count= mysql_stmt_affected_rows(stmt);
FAIL_UNLESS(row_count == (unsigned long long)-1, "rowcount != -1");
rc= mysql_stmt_prepare(stmt, update_query, (unsigned long)strlen(update_query));
rc= mysql_stmt_prepare(stmt, SL(update_query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -1348,7 +1348,7 @@ static int test_bug27592(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "INSERT INTO t1 VALUES (?)", (unsigned long)strlen("INSERT INTO t1 VALUES (?)"));
rc= mysql_stmt_prepare(stmt, SL("INSERT INTO t1 VALUES (?)"));
check_stmt_rc(rc, stmt);
memset(bind, '\0', sizeof(bind));
@@ -1402,7 +1402,7 @@ static int test_bug28934(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "select * from t1 where id in(?,?,?,?,?)", (unsigned long)strlen("select * from t1 where id in(?,?,?,?,?)"));
rc= mysql_stmt_prepare(stmt, SL("select * from t1 where id in(?,?,?,?,?)"));
check_stmt_rc(rc, stmt);
memset (&bind, '\0', sizeof (bind));
@@ -1468,7 +1468,7 @@ static int test_bug3035(MYSQL *mysql)
stmt_text= "DROP TABLE IF EXISTS t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "CREATE TABLE t1 (i8 TINYINT, ui8 TINYINT UNSIGNED, "
@@ -1476,7 +1476,7 @@ static int test_bug3035(MYSQL *mysql)
"i32 INT, ui32 INT UNSIGNED, "
"i64 BIGINT, ui64 BIGINT UNSIGNED, "
"id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
memset(bind_array, '\0', sizeof(bind_array));
@@ -1516,7 +1516,7 @@ static int test_bug3035(MYSQL *mysql)
stmt_text= "INSERT INTO t1 (i8, ui8, i16, ui16, i32, ui32, i64, ui64) "
"VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
mysql_stmt_bind_param(stmt, bind_array);
@@ -1546,7 +1546,7 @@ static int test_bug3035(MYSQL *mysql)
"cast(ui64 as signed), ui64, cast(ui64 as signed)"
"FROM t1 ORDER BY id ASC";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -1606,7 +1606,7 @@ static int test_bug3035(MYSQL *mysql)
mysql_stmt_close(stmt);
stmt_text= "DROP TABLE t1";
mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
mysql_real_query(mysql, SL(stmt_text));
return OK;
}
@@ -1640,7 +1640,7 @@ static int test_ps_conj_select(MYSQL *mysql)
"CONVERT(value1 USING utf8)= ?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "param_count != 2");
@@ -1730,7 +1730,7 @@ static int test_ps_null_param(MYSQL *mysql)
strcpy(query, *cur_query);
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
diag("statement: %s", query);
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 1, "param_count != 1");
@@ -1875,7 +1875,7 @@ static int test_ps_query_cache(MYSQL *mysql)
"CONVERT(value1 USING utf8)= ?");
stmt= mysql_stmt_init(lmysql);
FAIL_IF(!stmt, mysql_error(lmysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "param_count != 2");
@@ -2020,7 +2020,7 @@ static int test_bug3117(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT LAST_INSERT_ID()", (unsigned long)strlen("SELECT LAST_INSERT_ID()"));
rc= mysql_stmt_prepare(stmt, SL("SELECT LAST_INSERT_ID()"));
check_stmt_rc(rc, stmt);
rc= mysql_query(mysql, "INSERT INTO t1 VALUES (NULL)");
@@ -2083,7 +2083,7 @@ static int test_bug36004(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "select 1", (unsigned long)strlen("select 1"));
rc= mysql_stmt_prepare(stmt, SL("select 1"));
check_stmt_rc(rc, stmt);
FAIL_UNLESS(mysql_warning_count(mysql) == 0, "No warning expected");
@@ -2100,7 +2100,7 @@ static int test_bug36004(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "drop table if exists inexistant", (unsigned long)strlen("drop table if exists inexistant"));
rc= mysql_stmt_prepare(stmt, SL("drop table if exists inexistant"));
check_stmt_rc(rc, stmt);
query_int_variable(mysql, "@@warning_count", &warning_count);
@@ -2125,22 +2125,22 @@ static int test_bug3796(MYSQL *mysql)
/* Create and fill test table */
stmt_text= "DROP TABLE IF EXISTS t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "CREATE TABLE t1 (a INT, b VARCHAR(30))";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "INSERT INTO t1 VALUES(1, 'ONE'), (2, 'TWO')";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
/* Create statement handle and prepare it with select */
stmt= mysql_stmt_init(mysql);
stmt_text= "SELECT concat(?, b) FROM t1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
/* Bind input buffers */
memset(my_bind, '\0', sizeof(my_bind));
@@ -2178,7 +2178,7 @@ static int test_bug3796(MYSQL *mysql)
mysql_stmt_close(stmt);
stmt_text= "DROP TABLE IF EXISTS t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
return OK;
}
@@ -2199,7 +2199,7 @@ static int test_bug4026(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
stmt_text= "SELECT ?, ?";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
/* Bind input buffers */
memset(my_bind, '\0', sizeof(MYSQL_BIND) * 2);
@@ -2264,7 +2264,7 @@ static int test_bug4030(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
stmt_text= "SELECT '23:59:59.123456', '2003-12-31', "
"'2003-12-31 23:59:59.123456'";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -2328,7 +2328,7 @@ static int test_bug4079(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
stmt_text= "SELECT 1 < (SELECT a FROM t1)";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
/* Execute the select statement */
rc= mysql_stmt_execute(stmt);
@@ -2366,7 +2366,7 @@ static int test_bug4172(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
stmt_text= "SELECT f, d, e FROM t1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt); rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind)); my_bind[0].buffer_type= MYSQL_TYPE_STRING;
@@ -2387,7 +2387,7 @@ static int test_bug4172(MYSQL *mysql)
mysql_stmt_store_result(stmt);
rc= mysql_stmt_fetch(stmt);
check_stmt_rc(rc, stmt);
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
res= mysql_store_result(mysql);
row= mysql_fetch_row(res);
@@ -2411,20 +2411,20 @@ static int test_bug4231(MYSQL *mysql)
stmt_text= "DROP TABLE IF EXISTS t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "CREATE TABLE t1 (a int)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "INSERT INTO t1 VALUES (1)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
stmt_text= "SELECT a FROM t1 WHERE ? = ?";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
/* Bind input buffers */
memset(my_bind, '\0', sizeof(my_bind)); memset(tm, '\0', sizeof(tm));
@@ -2463,7 +2463,7 @@ static int test_bug4231(MYSQL *mysql)
mysql_stmt_close(stmt);
stmt_text= "DROP TABLE t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
return OK;
}
@@ -2482,7 +2482,7 @@ static int test_bug4236(MYSQL *mysql)
/* mysql_stmt_execute() of statement with statement id= 0 crashed server */
stmt_text= "SELECT 1";
/* We need to prepare statement to pass by possible check in libmysql */
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt); /* Hack to check that server works OK if statement wasn't found */
backup.stmt_id= stmt->stmt_id;
stmt->stmt_id= 0;
@@ -2493,7 +2493,7 @@ static int test_bug4236(MYSQL *mysql)
mysql1= test_connect(NULL);
stmt1= mysql_stmt_init(mysql1);
stmt_text= "SELECT 2";
rc= mysql_stmt_prepare(stmt1, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt1, SL(stmt_text));
check_stmt_rc(rc, stmt);
stmt->stmt_id= stmt1->stmt_id;
@@ -2520,20 +2520,20 @@ static int test_bug5126(MYSQL *mysql)
stmt_text= "DROP TABLE IF EXISTS t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "CREATE TABLE t1 (a mediumint, b int)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "INSERT INTO t1 VALUES (8386608, 1)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
stmt_text= "SELECT a, b FROM t1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -2605,7 +2605,7 @@ static int test_bug5194(MYSQL *mysql)
stmt_text= "drop table if exists t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
stmt_text= "create table if not exists t1"
"(c1 float, c2 float, c3 float, c4 float, c5 float, c6 float, "
@@ -2650,7 +2650,7 @@ static int test_bug5194(MYSQL *mysql)
"c235 float, c236 float, c237 float, c238 float, c239 float, c240 float, "
"c241 float, c242 float, c243 float, c244 float, c245 float, c246 float, "
"c247 float, c248 float, c249 float, c250 float)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
my_bind= (MYSQL_BIND*) malloc(MAX_PARAM_COUNT * sizeof(MYSQL_BIND));
@@ -2719,7 +2719,7 @@ static int test_bug5194(MYSQL *mysql)
check_stmt_rc(rc, stmt);
free(my_bind);
stmt_text= "drop table t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
return OK;
}
@@ -2735,7 +2735,7 @@ static int test_bug5315(MYSQL *mysql)
stmt_text= "SELECT 1";
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_change_user(mysql, username, password, schema);
check_mysql_rc(rc, mysql);
@@ -2747,7 +2747,7 @@ static int test_bug5315(MYSQL *mysql)
check_stmt_rc(rc, stmt);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -2777,7 +2777,7 @@ static int test_bug5399(MYSQL *mysql)
{
sprintf(buff, "select %d", (int) (stmt - stmt_list));
*stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(*stmt, buff, (unsigned long)strlen(buff));
rc= mysql_stmt_prepare(*stmt, SL(buff));
check_stmt_rc(rc, *stmt); mysql_stmt_bind_result(*stmt, my_bind);
}
@@ -2807,13 +2807,13 @@ static int test_bug6046(MYSQL *mysql)
stmt_text= "DROP TABLE IF EXISTS t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "CREATE TABLE t1 (a int, b int)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "INSERT INTO t1 VALUES (1,1),(2,2),(3,1),(4,2)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
@@ -2821,7 +2821,7 @@ static int test_bug6046(MYSQL *mysql)
stmt_text= "SELECT t1.a FROM t1 NATURAL JOIN t1 as X1 "
"WHERE t1.b > ? ORDER BY t1.a";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
b= 1;
memset(my_bind, '\0', sizeof(my_bind)); my_bind[0].buffer= &b;
@@ -2853,13 +2853,13 @@ static int test_bug6049(MYSQL *mysql)
stmt_text= "SELECT MAKETIME(-25, 12, 12)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
res= mysql_store_result(mysql);
row= mysql_fetch_row(res);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -2894,13 +2894,13 @@ static int test_bug6058(MYSQL *mysql)
stmt_text= "SELECT CAST('0000-00-00' AS DATE)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
res= mysql_store_result(mysql);
row= mysql_fetch_row(res);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -2931,7 +2931,7 @@ static int test_bug6059(MYSQL *mysql)
stmt_text= "SELECT 'foo' INTO OUTFILE 'x.3'";
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
FAIL_UNLESS(mysql_stmt_field_count(stmt) == 0, "");
mysql_stmt_close(stmt);
@@ -2952,7 +2952,7 @@ static int test_bug6096(MYSQL *mysql)
stmt_text= "drop table if exists t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
mysql_query(mysql, "set sql_mode=''");
@@ -2962,17 +2962,17 @@ static int test_bug6096(MYSQL *mysql)
" c_double double, c_varchar varchar(20), "
" c_char char(20), c_time time, c_date date, "
" c_datetime datetime)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "insert into t1 values (-100, -20000, 30000000, 4, 8, 1.0, "
"2.0, 'abc', 'def', now(), now(), now())";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "select * from t1";
/* Run select in prepared and non-prepared mode and compare metadata */
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
query_result= mysql_store_result(mysql);
query_field_list= mysql_fetch_fields(query_result);
@@ -2980,7 +2980,7 @@ static int test_bug6096(MYSQL *mysql)
query_field_count= mysql_num_fields(query_result);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt); rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt); mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH,
(void*) &update_max_length);
@@ -3015,7 +3015,7 @@ static int test_bug6096(MYSQL *mysql)
mysql_free_result(query_result);
mysql_free_result(stmt_metadata);
stmt_text= "drop table t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
return OK;
}
@@ -3052,17 +3052,17 @@ static int test_bug8330(MYSQL *mysql)
stmt_text= "drop table if exists t1";
/* in case some previos test failed */
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "create table t1 (a int, b int)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
memset(my_bind, '\0', sizeof(my_bind));
for (i=0; i < 2; i++)
{
stmt[i]= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt[i], query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt[i], SL(query));
check_stmt_rc(rc, stmt[i]);
my_bind[i].buffer_type= MYSQL_TYPE_LONG;
my_bind[i].buffer= (void*) &lval[i];
@@ -3080,7 +3080,7 @@ static int test_bug8330(MYSQL *mysql)
mysql_stmt_close(stmt[1]);
stmt_text= "drop table t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
return OK;
}
@@ -3115,7 +3115,7 @@ static int test_field_misc(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT @@autocommit", (unsigned long)strlen("SELECT @@autocommit"));
rc= mysql_stmt_prepare(stmt, SL("SELECT @@autocommit"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3140,7 +3140,7 @@ static int test_field_misc(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT @@max_error_count", (unsigned long)strlen("SELECT @@max_error_count"));
rc= mysql_stmt_prepare(stmt, SL("SELECT @@max_error_count"));
check_stmt_rc(rc, stmt);
result= mysql_stmt_result_metadata(stmt);
@@ -3167,7 +3167,7 @@ static int test_field_misc(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT @@max_allowed_packet", (unsigned long)strlen("SELECT @@max_allowed_packet"));
rc= mysql_stmt_prepare(stmt, SL("SELECT @@max_allowed_packet"));
check_stmt_rc(rc, stmt);
result= mysql_stmt_result_metadata(stmt);
@@ -3194,7 +3194,7 @@ static int test_field_misc(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT @@sql_warnings", (unsigned long)strlen("SELECT @@sql_warnings"));
rc= mysql_stmt_prepare(stmt, SL("SELECT @@sql_warnings"));
check_stmt_rc(rc, stmt);
result= mysql_stmt_result_metadata(stmt);
@@ -3278,7 +3278,7 @@ static int test_mem_overun(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "select * from t_mem_overun", (unsigned long)strlen("select * from t_mem_overun"));
rc= mysql_stmt_prepare(stmt, SL("select * from t_mem_overun"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3314,27 +3314,27 @@ static int test_bug8722(MYSQL *mysql)
/* Prepare test data */
stmt_text= "drop table if exists t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "drop view if exists v1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "CREATE TABLE t1 (c1 varchar(10), c2 varchar(10), c3 varchar(10),"
" c4 varchar(10), c5 varchar(10), c6 varchar(10),"
" c7 varchar(10), c8 varchar(10), c9 varchar(10),"
"c10 varchar(10))";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10)";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt_text= "CREATE VIEW v1 AS SELECT * FROM t1";
rc= mysql_real_query(mysql, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_real_query(mysql, SL(stmt_text));
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
stmt_text= "select * from v1";
rc= mysql_stmt_prepare(stmt, stmt_text, (unsigned long)strlen(stmt_text));
rc= mysql_stmt_prepare(stmt, SL(stmt_text));
check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt);
stmt_text= "drop table if exists t1, v1";
@@ -3368,8 +3368,7 @@ static int test_decimal_bug(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "select c1 from test_decimal_bug where c1=?",
(unsigned long)strlen("select c1 from test_decimal_bug where c1=?"));
rc= mysql_stmt_prepare(stmt, SL("select c1 from test_decimal_bug where c1=?"));
check_stmt_rc(rc, stmt);
/*
@@ -3470,7 +3469,7 @@ static int test_explain_bug(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "explain test_explain", (unsigned long)strlen("explain test_explain"));
rc= mysql_stmt_prepare(stmt, SL("explain test_explain"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3551,7 +3550,7 @@ static int test_explain_bug(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "explain select id, name FROM test_explain", (unsigned long)strlen("explain select id, name FROM test_explain"));
rc= mysql_stmt_prepare(stmt, SL("explain select id, name FROM test_explain"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3648,7 +3647,7 @@ static int test_sshort_bug(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT * FROM test_sshort", (unsigned long)strlen("SELECT * FROM test_sshort"));
rc= mysql_stmt_prepare(stmt, SL("SELECT * FROM test_sshort"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3728,7 +3727,7 @@ static int test_stiny_bug(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, "SELECT * FROM test_stiny", (unsigned long)strlen("SELECT * FROM test_stiny"));
rc= mysql_stmt_prepare(stmt, SL("SELECT * FROM test_stiny"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3795,7 +3794,7 @@ static int test_bug53311(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
for (i=0; i < 2; i++)
@@ -3888,7 +3887,7 @@ static int test_conc_5(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, "couldn't allocate memory");
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -3927,7 +3926,7 @@ static int test_conc141(MYSQL *mysql)
"END");
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3960,7 +3959,7 @@ static int test_conc154(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt, SL(stmtstr));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -3979,7 +3978,7 @@ static int test_conc154(MYSQL *mysql)
/* 2nd: empty result set with free_result */
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt, SL(stmtstr));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4006,7 +4005,7 @@ static int test_conc154(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt, SL(stmtstr));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4025,7 +4024,7 @@ static int test_conc154(MYSQL *mysql)
/* 4th non empty result set with free_result */
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt, SL(stmtstr));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4067,7 +4066,7 @@ static int test_conc155(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "SELECT a FROM t1", (unsigned long)strlen("SELECT a FROM t1"));
rc= mysql_stmt_prepare(stmt, SL("SELECT a FROM t1"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4118,7 +4117,7 @@ static int test_conc168(MYSQL *mysql)
bind.buffer_type= MYSQL_TYPE_STRING;
bind.buffer_length= 100;
rc= mysql_stmt_prepare(stmt, "SELECT a FROM conc168", (unsigned long)strlen("SELECT a FROM conc168"));
rc= mysql_stmt_prepare(stmt, SL("SELECT a FROM conc168"));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4173,7 +4172,7 @@ static int test_conc167(MYSQL *mysql)
bind[2].buffer_type= MYSQL_TYPE_STRING;
bind[2].buffer_length= 100;
rc= mysql_stmt_prepare(stmt, stmt_str, (unsigned long)strlen(stmt_str));
rc= mysql_stmt_prepare(stmt, SL(stmt_str));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4211,7 +4210,7 @@ static int test_conc177(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_str, (unsigned long)strlen(stmt_str));
rc= mysql_stmt_prepare(stmt, SL(stmt_str));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -4244,7 +4243,7 @@ static int test_conc177(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_str, (unsigned long)strlen(stmt_str));
rc= mysql_stmt_prepare(stmt, SL(stmt_str));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -4285,7 +4284,7 @@ static int test_conc179(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt, SL(stmtstr));
check_stmt_rc(rc, stmt);
if (mysql_get_server_version(mysql) >= 100100)
@@ -4367,7 +4366,7 @@ static int test_conc181(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_str, (unsigned long)strlen(stmt_str));
rc= mysql_stmt_prepare(stmt, SL(stmt_str));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -4482,7 +4481,7 @@ static int test_conc205(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)(unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));

10
unittest/libmariadb/ps_new.c
View File

@@ -153,7 +153,7 @@ int test_sp_params(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt,SL(stmtstr));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 3, "expected param_count=3");
@@ -236,7 +236,7 @@ int test_sp_reset(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt,SL(stmtstr));
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 3, "expected param_count=3");
@@ -291,7 +291,7 @@ int test_sp_reset1(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt,SL(stmtstr));
check_stmt_rc(rc, stmt);
memset(tmp, 0, sizeof(tmp));
@@ -361,7 +361,7 @@ int test_sp_reset2(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt,SL(stmtstr));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -443,7 +443,7 @@ int test_query(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, stmtstr, (unsigned long)strlen(stmtstr));
rc= mysql_stmt_prepare(stmt,SL(stmtstr));
check_stmt_rc(rc, stmt);
for (i=0; i < 1000; i++)

10
unittest/libmariadb/result.c
View File

@@ -101,7 +101,7 @@ static int test_free_result(MYSQL *mysql)
strcpy(query, "select * from test_free_result");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -183,7 +183,7 @@ static int test_free_store_result(MYSQL *mysql)
strcpy(query, "select * from test_free_result");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
memset(my_bind, '\0', sizeof(my_bind));
@@ -287,7 +287,7 @@ static int test_store_result(MYSQL *mysql)
strcpy(query, "SELECT * FROM test_store_result");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_result(stmt, my_bind);
@@ -389,7 +389,7 @@ static int test_store_result1(MYSQL *mysql)
strcpy(query, "SELECT * FROM test_store_result");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
@@ -458,7 +458,7 @@ static int test_store_result2(MYSQL *mysql)
strcpy((char *)query , "SELECT col1 FROM test_store_result where col1= ?");
stmt= mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql));
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, my_bind);

6
unittest/libmariadb/sp.c
View File

@@ -37,11 +37,11 @@ static int test_bug15752(MYSQL *mysql)
rc= mysql_query(mysql, "create procedure p1() select 1");
check_mysql_rc(rc, mysql);
rc= mysql_real_query(mysql, query, (unsigned long)strlen(query));
rc= mysql_real_query(mysql, SL(query));
check_mysql_rc(rc, mysql);
mysql_free_result(mysql_store_result(mysql));
rc= mysql_real_query(mysql, query, (unsigned long)strlen(query));
rc= mysql_real_query(mysql, SL(query));
FAIL_UNLESS(rc && mysql_errno(mysql) == CR_COMMANDS_OUT_OF_SYNC, "Error expected");
rc= mysql_next_result(mysql);
@@ -54,7 +54,7 @@ static int test_bug15752(MYSQL *mysql)
for (i = 0; i < ITERATION_COUNT; i++)
{
rc= mysql_real_query(mysql, query, (unsigned long)strlen(query));
rc= mysql_real_query(mysql, SL(query));
check_mysql_rc(rc, mysql);
mysql_free_result(mysql_store_result(mysql));
rc= mysql_next_result(mysql);

195
unittest/libmariadb/sqlite3.c
View File

@@ -1,195 +0,0 @@
/**
Some basic tests for sqlite
*/
#include "my_test.h"
#ifdef HAVE_SQLITE
static int test1(MYSQL *mysql)
{
MYSQL_ROW row;
MYSQL_RES *res;
int rc;
MYSQL *my= mysql_init(NULL);
FAIL_IF(!my, "mysql_init() failed");
mysql_options(my, MYSQL_DATABASE_DRIVER, "sqlite");
FAIL_IF(!mysql_real_connect(my, hostname, username, password, (schema) ? schema : "test",
port, socketname, 0), mysql_error(my));
diag("Server name: %s", mysql_get_server_name(my));
diag("Connected to: %s (%lu)", mysql_get_server_info(my), mysql_get_server_version(my));
rc= mysql_query(my, "CREATE TABLE t1 (a int, b varchar(255))");
rc= mysql_query(my, "DELETE FROM t1");
check_mysql_rc(rc, my);
rc= mysql_query(my, "BEGIN");
check_mysql_rc(rc, my);
rc= mysql_query(my, "INSERT INTO t1 VALUES (1, 'Monty')");
check_mysql_rc(rc, my);
rc= mysql_query(my, "INSERT INTO t1 VALUES (2, 'Serg')");
check_mysql_rc(rc, my);
rc= mysql_query(my, "INSERT INTO t1 VALUES (3, 'Holyfoot')");
check_mysql_rc(rc, my);
rc= mysql_query(my, "INSERT INTO t1 VALUES (4, 'Rasmus')");
check_mysql_rc(rc, my);
rc= mysql_query(my, "INSERT INTO t1 VALUES (5, 'Sanja')");
check_mysql_rc(rc, my);
rc= mysql_query(my, "COMMIT");
check_mysql_rc(rc, my);
rc= mysql_query(my, "SELECT a,b FROM t1");
check_mysql_rc(rc, my);
res= mysql_use_result(my);
FAIL_IF(!res, mysql_error(my));
while ((row= mysql_fetch_row(res)) != NULL)
{
FAIL_IF(mysql_num_fields(res) != 2, "Got the wrong number of fields");
}
FAIL_IF(mysql_num_rows(res) != 5, "expected 5 rows");
FAIL_IF(mysql_errno(my), mysql_error(my));
mysql_free_result(res);
rc= mysql_query(my, "SELECT a FROM t1");
check_mysql_rc(rc, my);
res= mysql_use_result(my);
mysql_free_result(res);
FAIL_IF(mysql_errno(my), mysql_error(my));
mysql_close(my);
return OK;
}
static int test_simple_prepare(MYSQL *my)
{
MYSQL *mysql= mysql_init(NULL);
MYSQL_STMT *stmt;
MYSQL_BIND bind[2];
int val1= 17;
char *val2= "MariaDB";
char buffer[100];
char *stmt_create= "CREATE TABLE t2 (a int, b varchar(200), c int)";
char *stmt_insert= "INSERT INTO t2 VALUES (1, ?, ?)";
int rc;
FAIL_IF(!mysql, "mysql_init() failed");
mysql_options(mysql, MYSQL_DATABASE_DRIVER, "sqlite");
FAIL_IF(!mysql_real_connect(mysql, hostname, username, password, (schema) ? schema : "test",
port, socketname, 0), mysql_error(my));
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t2");
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_create, strlen(stmt_create));
FAIL_IF(stmt->stmt_id != 1, "expected stmt_id=1");
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt), "Expected param_count= 0");
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_insert, strlen(stmt_insert));
FAIL_IF(stmt->stmt_id != 2, "expected stmt_id=2");
check_stmt_rc(rc, stmt);
FAIL_IF(mysql_stmt_param_count(stmt) != 2, "Expected 2 parameters");
mysql_stmt_close(stmt);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "CREATE xxxx (a int)", 50);
FAIL_IF(rc == 0, "error expected");
mysql_stmt_close(stmt);
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t2");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "CREATE TABLE t2 (a int, b varchar(20))");
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "INSERT INTO t2 VALUES(?,?)", 50);
check_stmt_rc(rc, stmt);
memset(bind, 0, sizeof(MYSQL_BIND) * 2);
bind[0].buffer_type= MYSQL_TYPE_LONG;
bind[0].buffer= &val1;
bind[1].buffer_type= MYSQL_TYPE_STRING;
bind[1].buffer= val2;
bind[1].buffer_length= strlen(val2);
rc= mysql_stmt_bind_param(stmt, bind);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
val1++;
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt);
bind[1].buffer= buffer;
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, "SELECT a,b FROM t2", 50);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_result(stmt, bind);
check_stmt_rc(rc, stmt);
mysql_stmt_fetch(stmt);
FAIL_IF(val1 != 17, "expected value=17");
mysql_stmt_fetch(stmt);
FAIL_IF(val1 != 18, "expected value=18");
rc= mysql_stmt_fetch(stmt);
FAIL_IF(rc != MYSQL_NO_DATA, "Expected eof");
mysql_stmt_close(stmt);
mysql_close(mysql);
return OK;
}
#endif
struct my_tests_st my_tests[] = {
#ifdef HAVE_SQLITE
{"test-sqlite", test1, TEST_CONNECTION_NONE, 0, NULL, NULL},
{"test_simple_prepare", test_simple_prepare, TEST_CONNECTION_NONE, 0, NULL, NULL},
#endif
{NULL, NULL, 0, 0, NULL, NULL}
};
int main(int argc, char **argv)
{
if (argc > 1)
get_options(argc, argv);
get_envvars();
run_tests(my_tests);
return(exit_status());
}

20
unittest/libmariadb/view.c
View File

@@ -74,7 +74,7 @@ static int test_view(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
strcpy(str_data, "TEST");
@@ -132,7 +132,7 @@ static int test_view_where(MYSQL *mysql)
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
for (i= 0; i < 3; i++)
@@ -217,7 +217,7 @@ static int test_view_2where(MYSQL *mysql)
my_bind[i].length = &length[i];
}
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, my_bind);
@@ -269,7 +269,7 @@ static int test_view_star(MYSQL *mysql)
}
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, my_bind);
@@ -317,11 +317,11 @@ static int test_view_insert(MYSQL *mysql)
check_mysql_rc(rc, mysql);
insert_stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(insert_stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(insert_stmt, SL(query));
check_stmt_rc(rc, insert_stmt);
query= "select * from t1";
select_stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(select_stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(select_stmt, SL(query));
check_stmt_rc(rc, select_stmt);
memset(my_bind, '\0', sizeof(MYSQL_BIND));
@@ -377,7 +377,7 @@ static int test_left_join_view(MYSQL *mysql)
rc= mysql_query(mysql,"create view v1 (x) as select a from t1 where a > 1");
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
for (i= 0; i < 3; i++)
@@ -449,7 +449,7 @@ static int test_view_insert_fields(MYSQL *mysql)
my_bind[i].length= &l[i];
}
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt);
@@ -460,7 +460,7 @@ static int test_view_insert_fields(MYSQL *mysql)
query= "select * from t1";
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
@@ -603,7 +603,7 @@ static int test_bug11111(MYSQL *mysql)
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query));
rc= mysql_stmt_prepare(stmt, SL(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);