From 6664e73733dd816e7e8ccd5b0ac75401742ecc62 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich <svoj@mariadb.org> Date: Thu, 1 Aug 2013 16:00:50 +0400 Subject: [PATCH] MDEV-4786 - merge 10.0-monty - 10.0 Fixed main.partition_cache, main.partition_cache_innodb, main.partition_cache_myisam, main.query_cache failures. libmysqld/emb_qcache.cc: Restore proper method to retrieve warnings number. --- libmysqld/emb_qcache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc index db236d826c..f1e850f421 100644 --- a/libmysqld/emb_qcache.cc +++ b/libmysqld/emb_qcache.cc @@ -487,7 +487,7 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src) data->embedded_info->prev_ptr= prev_row; return_ok: net_send_eof(thd, thd->server_status, - thd->get_stmt_da()->statement_warn_count()); + thd->get_stmt_da()->current_statement_warn_count()); DBUG_RETURN(0); err: DBUG_RETURN(1); -- 2.30.9