diff options
author | holyfoot/hf@hfmain.(none) <> | 2007-01-03 02:43:59 +0400 |
---|---|---|
committer | holyfoot/hf@hfmain.(none) <> | 2007-01-03 02:43:59 +0400 |
commit | f95e387212dd7b9fa7eb59f6ada9329a3922993a (patch) | |
tree | a2a20b08b66316eb5d378803bad5db79c234c00f /libmysqld | |
parent | 4c588df26ead2851dda8d44bcd4b5b30c6eaf832 (diff) | |
parent | 988e2e4cad2ba41c0b58b89556ae577eef5a2c86 (diff) | |
download | mariadb-git-f95e387212dd7b9fa7eb59f6ada9329a3922993a.tar.gz |
Merge mysql.com:/d2/hf/common/my50-common
into mysql.com:/d2/hf/common/my51-common
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) { |