From 8fdcf73109e81e3487e3e385cf44c9c15ff852fb Mon Sep 17 00:00:00 2001
From: "kaiwang.ckw" <kaiwang.ckw@alibaba-inc.com>
Date: Fri, 7 May 2021 15:12:58 +0800
Subject: [PATCH 1/2] regression tests: fix connection options for external
 MySQL servers

---
 tests/include/api_sql_common.sh |  4 +---
 tests/include/mysql_common.sh   | 18 +++++++++++++++++-
 tests/include/pgsql_common.sh   |  2 ++
 tests/t/api_sql_mysql.t         |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/tests/include/api_sql_common.sh b/tests/include/api_sql_common.sh
index aefb1b591..903c4968e 100644
--- a/tests/include/api_sql_common.sh
+++ b/tests/include/api_sql_common.sh
@@ -156,9 +156,7 @@ end
 EOF
 # Reset --mysql-socket if it's specified on the command line, otherwise sysbench
 # will assume --mysql-host=localhost
-sysbench $SB_ARGS --mysql-host="non-existing" --pgsql-host="non-existing" \
-         --mysql-socket= \
-         run
+sysbench $SB_ARGS $DB_NON_EXISTING run
 
 # Error hooks
 cat >$CRAMTMP/api_sql.lua <<EOF
diff --git a/tests/include/mysql_common.sh b/tests/include/mysql_common.sh
index 9af7cc620..e70c71115 100644
--- a/tests/include/mysql_common.sh
+++ b/tests/include/mysql_common.sh
@@ -8,8 +8,24 @@ then
   exit 80
 fi
 
+MYSQL_ARGS=`echo -n $SBTEST_MYSQL_ARGS | sed -- 's/--mysql-db=//;s/--mysql-/--/g'`
+
+if echo -n $SBTEST_MYSQL_ARGS | grep -q -- --mysql-db; then
+  MYSQL_DB=""
+else
+  MYSQL_DB=sbtest
+fi
+
+if echo -n $SBTEST_MYSQL_ARGS | grep -q -- --mysql-user; then
+  MYSQL_USER=
+else
+  MYSQL_USER=-usbtest
+fi
+
 function db_show_table() {
-  mysql -uroot sbtest -Nse "SHOW CREATE TABLE $1\G"
+  mysql $MYSQL_ARGS $MYSQL_USER $MYSQL_DB -Nse "SHOW CREATE TABLE $1\G"
 }
 
 DB_DRIVER_ARGS="--db-driver=mysql $SBTEST_MYSQL_ARGS"
+
+DB_NON_EXISTING="--mysql-host=non-existing --mysql-socket="
diff --git a/tests/include/pgsql_common.sh b/tests/include/pgsql_common.sh
index 27d2d8557..f915ddbc7 100644
--- a/tests/include/pgsql_common.sh
+++ b/tests/include/pgsql_common.sh
@@ -62,3 +62,5 @@ EOF
 }
 
 DB_DRIVER_ARGS="--db-driver=pgsql $SBTEST_PGSQL_ARGS"
+
+DB_NON_EXISTING="--pgsql-host=non-existing"
diff --git a/tests/t/api_sql_mysql.t b/tests/t/api_sql_mysql.t
index 9bb7485e0..c12eea882 100644
--- a/tests/t/api_sql_mysql.t
+++ b/tests/t/api_sql_mysql.t
@@ -72,7 +72,7 @@ SQL Lua API + MySQL tests
   --
   reconnects = 1
   FATAL: unable to connect to MySQL server on host 'non-existing', port 3306, aborting...
-  FATAL: error 2005: Unknown MySQL server host 'non-existing' (0)
+  FATAL: error 2005: Unknown MySQL server host 'non-existing' (2)
   connection creation failed
   --
   FATAL: mysql_drv_query() returned error 1048 (Column 'a' cannot be null) for query 'INSERT INTO t VALUES (NULL)'

From 9427a3daf4bfef2c7c9b0b5dcedc716116f62d91 Mon Sep 17 00:00:00 2001
From: "kaiwang.ckw" <kaiwang.ckw@alibaba-inc.com>
Date: Fri, 7 May 2021 17:19:40 +0800
Subject: [PATCH 2/2] Fix client prepare with string parameter.

---
 src/db_driver.c                 | 13 +++++++++++-
 tests/include/api_sql_common.sh | 37 +++++++++++++++++++++++++++++++++
 tests/t/api_sql_mysql.t         |  8 +++++++
 tests/t/api_sql_pgsql.t         |  8 +++++++
 4 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/src/db_driver.c b/src/db_driver.c
index 97310a66f..658e7d18b 100644
--- a/src/db_driver.c
+++ b/src/db_driver.c
@@ -852,6 +852,8 @@ int db_parse_arguments(void)
 int db_print_value(db_bind_t *var, char *buf, int buflen)
 {
   int       n;
+  char     *p;
+  char     *end;
   db_time_t *tm;
 
   if (var->is_null != NULL && *var->is_null)
@@ -881,7 +883,16 @@ int db_print_value(db_bind_t *var, char *buf, int buflen)
       break;
     case DB_TYPE_CHAR:
     case DB_TYPE_VARCHAR:
-      n = snprintf(buf, buflen, "'%s'", (char *)var->buffer);
+      if (buflen < (int)var->max_len + 3)
+        return -1;
+      n = 0;
+      p = (char *)var->buffer;
+      end = p + var->max_len;
+      buf[n++] = '\'';
+      while (*p && p < end)
+        buf[n++] = *p++;
+      buf[n++] = '\'';
+      buf[n] = '\0';
       break;
     case DB_TYPE_DATE:
       tm = (db_time_t *)var->buffer;
diff --git a/tests/include/api_sql_common.sh b/tests/include/api_sql_common.sh
index 903c4968e..6fb5d199e 100644
--- a/tests/include/api_sql_common.sh
+++ b/tests/include/api_sql_common.sh
@@ -272,3 +272,40 @@ end
 EOF
 
 sysbench $SB_ARGS
+
+cat <<EOF
+########################################################################
+# Client prepare with string parameter is broken
+########################################################################
+EOF
+
+cat >$CRAMTMP/api_sql.lua <<EOF
+con = sysbench.sql.driver():connect()
+con:query("create table t (a char(8))")
+
+function print_result(query)
+  print('--')
+  local rs = con:query(query)
+  for i = 1, rs.nrows do
+    local a = unpack(rs:fetch_row(), 1, rs.nfields)
+    print(a)
+  end
+end
+
+local v = '12345678'
+
+con:query(("insert into t (a) values ('%s')"):format(v))
+print_result("select a from t")
+
+local stmt = con:prepare("insert into t (a) values (?)")
+local p = stmt:bind_create(sysbench.sql.type.CHAR, 8)
+stmt:bind_param(p)
+
+p:set(v)
+stmt:execute()
+print_result("select a from t")
+
+con:query("drop table t")
+EOF
+
+sysbench --db-ps-mode=disable $SB_ARGS
diff --git a/tests/t/api_sql_mysql.t b/tests/t/api_sql_mysql.t
index c12eea882..401ee184c 100644
--- a/tests/t/api_sql_mysql.t
+++ b/tests/t/api_sql_mysql.t
@@ -133,6 +133,14 @@ SQL Lua API + MySQL tests
   ########################################################################
   1
   2
+  ########################################################################
+  # Client prepare with string parameter is broken
+  ########################################################################
+  --
+  12345678
+  --
+  12345678
+  12345678
 ########################################################################
 # GH-304: Benchmark Stored Procedure with sysbench
 ########################################################################
diff --git a/tests/t/api_sql_pgsql.t b/tests/t/api_sql_pgsql.t
index e8bd3edbe..a581e81dd 100644
--- a/tests/t/api_sql_pgsql.t
+++ b/tests/t/api_sql_pgsql.t
@@ -138,3 +138,11 @@ SQL Lua API + PostgreSQL tests
   ########################################################################
   1
   2
+  ########################################################################
+  # Client prepare with string parameter is broken
+  ########################################################################
+  --
+  12345678
+  --
+  12345678
+  12345678