diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-01-03 02:43:59 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-01-03 02:43:59 +0400 |
| commit | 43ff17e6496994237162b35a6c10a6592900d2c8 (patch) | |
| tree | a2a20b08b66316eb5d378803bad5db79c234c00f /libmysqld | |
| parent | f31014ed6eceae86e3766c8537742997f50ba4e8 (diff) | |
| parent | 3bd21c841411403a06b079a7e934fa9173ce2808 (diff) | |
| download | mariadb-git-43ff17e6496994237162b35a6c10a6592900d2c8.tar.gz | |
Merge mysql.com:/d2/hf/common/my50-common
into mysql.com:/d2/hf/common/my51-common
libmysqld/lib_sql.cc:
Auto merged
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 da7a490d686..2853baf2dfe 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) { |