~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138

« back to all changes in this revision

Viewing changes to log_connection_error.patch

  • Committer: Ignacio Nin
  • Date: 2011-03-27 18:30:06 UTC
  • mfrom: (88.2.3 5.5.10)
  • Revision ID: ignacio.nin@percona.com-20110327183006-ij0o2pdyhzaerish
Merge 5.5.10 changes

Merge 5.5.10 changes to release-5.5.9-20.1 in order to create release-5.5.10-20.1

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     2010-07-28 16:47:47.105319218 +0400
20
20
+++ b/sql/mysqld.cc     2010-07-28 16:47:47.644101813 +0400
21
 
@@ -4990,6 +4990,10 @@
 
21
@@ -5011,6 +5011,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
 
@@ -5370,6 +5374,10 @@
 
32
@@ -5391,6 +5395,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
 
@@ -5565,6 +5573,10 @@
 
43
@@ -5586,6 +5594,10 @@
44
44
                                                    event_conn_closed)) ||
45
45
                         my_net_init(&thd->net, thd->net.vio))
46
46
     {