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 | 81714523493944a03eaa1940ecd711a69fdb7cef (patch) | |
| tree | 27beee83c83e3177901d19c5d4c227a2278a5bf9 | |
| parent | 4ab0098bf55a73367ea963fd4f20f99303ded265 (diff) | |
| parent | e1d6b732360cb39817a735ed5f3734cecf8f818d (diff) | |
| download | mariadb-git-81714523493944a03eaa1940ecd711a69fdb7cef.tar.gz | |
Merge mysql.com:/d2/hf/common/my41-common
into mysql.com:/d2/hf/common/my50-common
libmysqld/lib_sql.cc:
merging
| -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) { |