1
0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00

Test fixes:

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

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));