[Commits] Rev 3806: MDEV-4786 - merge 10.0-monty - 10.0 in lp:~maria-captains/maria/10.0-serg

Sergey Vojtovich svoj at mariadb.org
Thu Aug 1 15:00:54 EEST 2013


At lp:~maria-captains/maria/10.0-serg

------------------------------------------------------------
revno: 3806
revision-id: svoj at mariadb.org-20130801120050-cc3sf2bvunn02dfw
parent: sanja at montyprogram.com-20130731134129-2jsiughehpl88zdz
committer: Sergey Vojtovich <svoj at mariadb.org>
branch nick: 10.0-serg
timestamp: Thu 2013-08-01 16:00:50 +0400
message:
  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.
=== modified file 'libmysqld/emb_qcache.cc'
--- a/libmysqld/emb_qcache.cc	2013-07-21 14:39:19 +0000
+++ b/libmysqld/emb_qcache.cc	2013-08-01 12:00:50 +0000
@@ -487,7 +487,7 @@ int emb_load_querycache_result(THD *thd,
   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);



More information about the commits mailing list