diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-01-26 16:34:34 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-01-26 16:34:34 +0100 |
| commit | ad74ed74d9e285a3678b98235094c16eafcbff3a (patch) | |
| tree | c991af53b7e912b12ef40cadfa95a508d80a6646 | |
| parent | 02b45f2acf344149dd9d2c48db4e69937e48c956 (diff) | |
| parent | 38c5e2cae8338d8941182dacb988b2aa8027cca4 (diff) | |
| download | mariadb-git-ad74ed74d9e285a3678b98235094c16eafcbff3a.tar.gz | |
merge
| -rw-r--r-- | client/mysqltest.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 9421e80de2d..a94dba90979 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -7255,8 +7255,12 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, mysql_free_result(res); /* Free normal result set with meta data */ - /* Clear prepare warnings */ - dynstr_set(&ds_prepare_warnings, NULL); + /* + Clear prepare warnings if there are execute warnings, + since they are probably duplicated. + */ + if (ds_execute_warnings.length || mysql->warning_count) + dynstr_set(&ds_prepare_warnings, NULL); } else { |