diff options
| author | monty@mashka.mysql.fi <> | 2003-01-04 15:37:20 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-04 15:37:20 +0200 |
| commit | 6d6f051178c7c3201c77b5fa427252d50bd5fea3 (patch) | |
| tree | aa5cff7e153050d86b7effd693496f071d21e24a /client | |
| parent | 07daf3169e0d55d31b2974098f9002f8508c4186 (diff) | |
| download | mariadb-git-6d6f051178c7c3201c77b5fa427252d50bd5fea3.tar.gz | |
Added support for DROP TEMPORARY TABLE
Removed mysql_warnings() API function.
Post merge fixes.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 9d724404edc..6a637c0533c 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2207,10 +2207,15 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) /* Add all warnings to the result */ if (!disable_result_log && mysql_warning_count(mysql)) { - MYSQL_RES *warn_res= mysql_warnings(mysql); + MYSQL_RES *warn_res=0; + uint count= mysql_warning_count(mysql); + if (!mysql_real_query(mysql, "SHOW WARNINGS", 13)) + { + warn_res=mysql_store_result(mysql); + } if (!warn_res) - verbose_msg("Warning count is %d but didn't get any warnings\n", - mysql_warning_count(mysql)); + verbose_msg("Warning count is %u but didn't get any warnings\n", + count); else { dynstr_append_mem(ds, "Warnings:\n", 10); |