summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorholyfoot/hf@mysql.com/hfmain.(none) <>2007-01-03 02:43:27 +0400
committerholyfoot/hf@mysql.com/hfmain.(none) <>2007-01-03 02:43:27 +0400
commit988e2e4cad2ba41c0b58b89556ae577eef5a2c86 (patch)
tree27beee83c83e3177901d19c5d4c227a2278a5bf9 /libmysqld
parenta44106c07ca14919a19fc8dfd44e0b5bd1dc77d4 (diff)
parent12cd7c7b3e516398fb704f813123d4f3e2857a01 (diff)
downloadmariadb-git-988e2e4cad2ba41c0b58b89556ae577eef5a2c86.tar.gz
Merge mysql.com:/d2/hf/common/my41-common
into mysql.com:/d2/hf/common/my50-common
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 6be3b92c8f8..2eea24e364c 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -198,6 +198,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= 0;
+ mysql->warning_count= thd->total_warn_count;
if (thd->first_data)
{