diff options
author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-03 02:43:27 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-03 02:43:27 +0400 |
commit | 3bd21c841411403a06b079a7e934fa9173ce2808 (patch) | |
tree | 27beee83c83e3177901d19c5d4c227a2278a5bf9 /libmysqld | |
parent | d4a874f64b3c4bca9cd6579a6032e8c71317522d (diff) | |
parent | c81140f5a18602844d2419c49b326cf0fddea5e7 (diff) | |
download | mariadb-git-3bd21c841411403a06b079a7e934fa9173ce2808.tar.gz |
Merge mysql.com:/d2/hf/common/my41-common
into mysql.com:/d2/hf/common/my50-common
libmysqld/lib_sql.cc:
merging
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/lib_sql.cc | 1 |
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) { |