← Back to branch summary

~rodrigo-gadea-percona/percona-server/ps-docs

« back to all changes in this revision

Viewing changes to patches/log_connection_error.patch

  • Committer: Rodrigo Gadea
  • Date: 2011-08-18 03:55:55 UTC
  • Revision ID: rodrigo.gadea@percona.com-20110818035555-ffaern4vpzg21dbi
Merging divergences again... for the third time...

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/log_connection_error.patch
5
5
#!!! notice !!!
6
6
# Any small change to this file in the main branch
7
7
# should be done or reviewed by the maintainer!
8
 
diff -ruN /dev/null b/patch_info/log_connection_error.patch
9
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
10
 
+++ b/patch_info/log_connection_error.patch     2011-04-09 18:48:54.000000000 +0400
 
8
--- /dev/null
 
9
+++ b/patch_info/log_connection_error.patch
11
10
@@ -0,0 +1,6 @@
12
11
+File=log_connection_error.patch
13
12
+Name=logging abandoned connections
15
14
+Author=Percona <info@percona.com>
16
15
+License=GPL
17
16
+Comment=
18
 
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
19
 
--- a/sql/mysqld.cc     2011-04-09 18:48:53.000000000 +0400
20
 
+++ b/sql/mysqld.cc     2011-04-09 18:48:54.000000000 +0400
 
17
--- a/sql/mysqld.cc
 
18
+++ b/sql/mysqld.cc
21
19
@@ -5098,6 +5098,10 @@
22
20
 
23
21
     DBUG_PRINT("error",("Too many connections"));
29
27
     delete thd;
30
28
     DBUG_VOID_RETURN;
31
29
   }
32
 
@@ -5478,6 +5482,10 @@
 
30
@@ -5481,6 +5485,10 @@
33
31
     if (!(thd->net.vio= vio_new_win32pipe(hConnectedPipe)) ||
34
32
        my_net_init(&thd->net, thd->net.vio))
35
33
     {
40
38
       close_connection(thd, ER_OUT_OF_RESOURCES);
41
39
       delete thd;
42
40
       continue;
43
 
@@ -5673,6 +5681,10 @@
 
41
@@ -5676,6 +5684,10 @@
44
42
                                                    event_conn_closed)) ||
45
43
                         my_net_init(&thd->net, thd->net.vio))
46
44
     {