From e229fe9801cc9fb7e3783cf708bc7cb695606c64 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 4 Jan 2003 15:37:20 +0200 Subject: Added support for DROP TEMPORARY TABLE Removed mysql_warnings() API function. Post merge fixes. client/mysqltest.c: Don't use mysql_warnings(). include/mysql.h: Removed mysql_warnings() API function libmysql/libmysql.c: Removed mysql_warnings() API function mysql-test/r/rpl_log_pos.result: Updated results mysql-test/t/connect.test: Removed empty lines mysql-test/t/rpl_log_pos.test: Update to new syntax sql/item.h: Fix after merge sql/item_create.cc: Fix after merge sql/mysql_priv.h: Added support for DROP TEMPORARY TABLE sql/sql_db.cc: Added support for DROP TEMPORARY TABLE sql/sql_parse.cc: SHOW WARNINGS now shows notes, warnings and errors. Support for DROP TEMPORARY TABLE Post merge fixes sql/sql_repl.cc: Post merge fixes sql/sql_table.cc: Added support for DROP TEMPORARY TABLE --- client/mysqltest.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'client/mysqltest.c') 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); -- cgit v1.2.1