diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-08-01 16:00:50 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-08-01 16:00:50 +0400 |
| commit | 6664e73733dd816e7e8ccd5b0ac75401742ecc62 (patch) | |
| tree | 3c7aa2043c362f7f10160bd13dd6bb07dfc0cf1a /libmysqld/emb_qcache.cc | |
| parent | 94dfa010bc404a4803dbbb4aad5892a73c7f9c47 (diff) | |
| download | mariadb-git-6664e73733dd816e7e8ccd5b0ac75401742ecc62.tar.gz | |
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.
Diffstat (limited to 'libmysqld/emb_qcache.cc')
| -rw-r--r-- | libmysqld/emb_qcache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc index db236d826c9..f1e850f4218 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); |