~vlad-lesin/percona-server/pintables

« back to all changes in this revision

Viewing changes to log_connection_error.patch

  • Committer: Laurynas Biveinis
  • Date: 2011-06-21 02:36:36 UTC
  • mfrom: (123 merge)
  • mto: This revision was merged to the branch mainline in revision 124.
  • Revision ID: laurynas.biveinis@percona.com-20110621023636-ccp1iyyrncj181zt
MergeĀ fromĀ lp:percona-server

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
19
19
--- a/sql/mysqld.cc     2011-04-09 18:48:53.000000000 +0400
20
20
+++ b/sql/mysqld.cc     2011-04-09 18:48:54.000000000 +0400
21
 
@@ -5044,6 +5044,10 @@
 
21
@@ -5040,6 +5040,10 @@
22
22
 
23
23
     DBUG_PRINT("error",("Too many connections"));
24
24
     close_connection(thd, ER_CON_COUNT_ERROR);
29
29
     delete thd;
30
30
     DBUG_VOID_RETURN;
31
31
   }
32
 
@@ -5424,6 +5428,10 @@
 
32
@@ -5420,6 +5424,10 @@
33
33
     if (!(thd->net.vio= vio_new_win32pipe(hConnectedPipe)) ||
34
34
        my_net_init(&thd->net, thd->net.vio))
35
35
     {
40
40
       close_connection(thd, ER_OUT_OF_RESOURCES);
41
41
       delete thd;
42
42
       continue;
43
 
@@ -5619,6 +5627,10 @@
 
43
@@ -5615,6 +5623,10 @@
44
44
                                                    event_conn_closed)) ||
45
45
                         my_net_init(&thd->net, thd->net.vio))
46
46
     {