summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-01-06 16:59:29 +0200
committermonty@mysql.com <>2005-01-06 16:59:29 +0200
commitef74d8d89880fe5c76971f5cc22a11184445f6d6 (patch)
tree52613241dc7c0cb3ac99bd8da61be5bf2aa09faa /libmysql/libmysql.c
parentbda0a781841d340fe559432ed91707e66b73d484 (diff)
downloadmariadb-git-ef74d8d89880fe5c76971f5cc22a11184445f6d6.tar.gz
Fixed a bug in prepared statements error handling
After merge fixes
Diffstat (limited to 'libmysql/libmysql.c')
-rw-r--r--libmysql/libmysql.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 209dcf5756a..29c6f469098 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1864,12 +1864,13 @@ void set_stmt_errmsg(MYSQL_STMT * stmt, const char *err, int errcode,
my_bool cli_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
{
uchar *pos;
- uint field_count, param_count, packet_length;
+ uint field_count, param_count;
+ ulong packet_length;
MYSQL_DATA *fields_data;
- DBUG_ENTER("read_prepare_result");
+ DBUG_ENTER("cli_read_prepare_result");
mysql= mysql->last_used_con;
- if ((packet_length=net_safe_read(mysql)) == packet_error)
+ if ((packet_length= net_safe_read(mysql)) == packet_error)
DBUG_RETURN(1);
mysql->warning_count= 0;