summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-12-06 19:18:35 +0200
committermonty@mysql.com <>2004-12-06 19:18:35 +0200
commit77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (patch)
tree44698f6f68c51daacf7552356ae071b8e8fdb035 /libmysql
parente99d5fee828e40589d7a29b81bba32b53e94037a (diff)
parent67ce24796584e80cf843b37b09aeb794c9231190 (diff)
downloadmariadb-git-77207d19f20f21c54b8d5279c6924f4c4bdaaa51.tar.gz
Merge with new VARCHAR code
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 3e98d8399ff..dc0ef57e910 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -3151,6 +3151,7 @@ my_bool STDCALL mysql_stmt_bind_param(MYSQL_STMT *stmt, MYSQL_BIND *bind)
case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_BLOB:
+ case MYSQL_TYPE_VARCHAR:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
param->store_param_func= store_param_str;
@@ -4035,6 +4036,7 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind)
DBUG_ASSERT(param->buffer_length != 0);
param->fetch_result= fetch_result_bin;
break;
+ case MYSQL_TYPE_VARCHAR:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
DBUG_ASSERT(param->buffer_length != 0);
@@ -4099,6 +4101,7 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind)
case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_BLOB:
+ case MYSQL_TYPE_VARCHAR:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
param->skip_result= skip_result_string;