~percona-core/percona-server/5.1

« back to all changes in this revision

Viewing changes to patches/bug813587.patch

  • Committer: Stewart Smith
  • Date: 2011-11-24 08:14:40 UTC
  • Revision ID: stewart@flamingspork.com-20111124081440-jffloqgkbgytzgl5
remove now unneeded patches as we're part of a happy bzr tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# name       : bug813587.patch
2
 
# maintainer : Alexey
3
 
#
4
 
# Fix for LP bug #813587 / MySQL bug #51196 / MySQL bug #61790
5
 
#
6
 
# Clear MySQL connection errors in ha_federated::close(), since they
7
 
# can affect queries on other tables due to table cache eviction.
8
 
#
9
 
--- a/storage/federated/ha_federated.cc
10
 
+++ b/storage/federated/ha_federated.cc
11
 
@@ -1641,6 +1641,7 @@
12
 
 
13
 
 int ha_federated::close(void)
14
 
 {
15
 
+  THD *thd= current_thd;
16
 
   DBUG_ENTER("ha_federated::close");
17
 
 
18
 
   free_result();
19
 
@@ -1651,6 +1652,10 @@
20
 
   mysql_close(mysql);
21
 
   mysql= NULL;
22
 
 
23
 
+  /* Clear possible errors from mysql_close(), see LP bug #813587. */
24
 
+  if (thd)
25
 
+    thd->clear_error();
26
 
+
27
 
   DBUG_RETURN(free_share(share));
28
 
 }
29