diff options
| author | unknown <monty@mysql.com> | 2005-01-06 16:59:29 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-06 16:59:29 +0200 |
| commit | 615cd4ff75a848f2fcda88b60052082d6ec9d9b2 (patch) | |
| tree | 52613241dc7c0cb3ac99bd8da61be5bf2aa09faa /libmysql | |
| parent | 8ff8867251ccfefed1785efb50e56bc80aaf7663 (diff) | |
| download | mariadb-git-615cd4ff75a848f2fcda88b60052082d6ec9d9b2.tar.gz | |
Fixed a bug in prepared statements error handling
After merge fixes
libmysql/libmysql.c:
Fixed a bug in prepared statements error handling introduced by me on a recent patch
mysql-test/r/delayed.result:
Updated results
mysql-test/t/delayed.test:
Bigger timeout needed when using --ps-protocol (don't understand why yet)
Added output of not_flushed_dealyed_rows for easier debugging
sql/sql_base.cc:
USE tables_share fix for prepared statements
sql/sql_prepare.cc:
After merge fix
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 7 |
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; |