From c79aeba1bd66c03b70ade63d5e1879d5ae552676 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 2 Jan 2007 17:53:55 +0400 Subject: merging fix --- libmysqld/lib_sql.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'libmysqld') diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 825e5e507ad..f5e88190cac 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -250,8 +250,6 @@ int emb_read_binary_rows(MYSQL_STMT *stmt) MYSQL_DATA *data; if (!(data= emb_read_rows(stmt->mysql, 0, 0))) { - stmt->result= *data; - my_free((char *) data, MYF(0)); set_stmt_errmsg(stmt, stmt->mysql->net.last_error, stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate); return 1; -- cgit v1.2.1 From c81140f5a18602844d2419c49b326cf0fddea5e7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 3 Jan 2007 02:41:14 +0400 Subject: warning count for embedded prepared statements added libmysqld/lib_sql.cc: reading warning count added --- libmysqld/lib_sql.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'libmysqld') diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index f5e88190cac..fe4ac5ba676 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -181,6 +181,7 @@ static my_bool emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt) stmt->stmt_id= thd->client_stmt_id; stmt->param_count= thd->client_param_count; stmt->field_count= mysql->field_count; + mysql->warning_count= thd->total_warn_count; if (stmt->field_count != 0) { -- cgit v1.2.1