diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-01-26 19:33:53 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-01-26 19:33:53 +0100 |
| commit | 6ae9810f388034ac9509d8709e97c0575d316c95 (patch) | |
| tree | b8710a28697907b5b3c47d1637b8f14d8b7b9e2e /client | |
| parent | e99f2b1c4efa0d9c1f6eef549562f8d7f165b404 (diff) | |
| parent | ec5e43da337688d4b6f169143bb9e12409402f3b (diff) | |
| download | mariadb-git-6ae9810f388034ac9509d8709e97c0575d316c95.tar.gz | |
merge of bug 47902 and (null-merge) of bug 57924.
bug#57924 does not occur in 5.5, so I reverted the 5.1 specific
code and used the errors from 5.5 instead in the tests
Diffstat (limited to 'client')
| -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 5d33f293a28..ffc99a3dffd 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -7555,8 +7555,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 { |