Commit 45d9a514 authored by Jim Winstead's avatar Jim Winstead

Merge approved bug fix

parents 2fed6607 43e77cd3
...@@ -2270,7 +2270,7 @@ mysql_stmt_param_metadata(MYSQL_STMT *stmt) ...@@ -2270,7 +2270,7 @@ mysql_stmt_param_metadata(MYSQL_STMT *stmt)
/* Store type of parameter in network buffer. */ /* Store type of parameter in network buffer. */
static void store_param_type(char **pos, MYSQL_BIND *param) static void store_param_type(unsigned char **pos, MYSQL_BIND *param)
{ {
uint typecode= param->buffer_type | (param->is_unsigned ? 32768 : 0); uint typecode= param->buffer_type | (param->is_unsigned ? 32768 : 0);
int2store(*pos, typecode); int2store(*pos, typecode);
...@@ -2550,7 +2550,7 @@ int cli_stmt_execute(MYSQL_STMT *stmt) ...@@ -2550,7 +2550,7 @@ int cli_stmt_execute(MYSQL_STMT *stmt)
that is sent to the server. that is sent to the server.
*/ */
for (param= stmt->params; param < param_end ; param++) for (param= stmt->params; param < param_end ; param++)
store_param_type((char**) &net->write_pos, param); store_param_type(&net->write_pos, param);
} }
for (param= stmt->params; param < param_end; param++) for (param= stmt->params; param < param_end; param++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment