- up to 5.5.11

[packages/mysql.git] / log_connection_error.patch

diff --git a/log_connection_error.patch b/log_connection_error.patch
index 228ff7d244f5e6d6bebaa13ed769baca541dff29..49815e0b73380fba935ecdf7e294cf8235cdc9bd 100644 (file)
--- a/log_connection_error.patch
+++ b/log_connection_error.patch
@@ -5,9 +5,9 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/patch_info/log_connection_error.patch b/patch_info/log_connection_error.patch
---- a/patch_info/log_connection_error.patch    1970-01-01 03:00:00.000000000 +0300
-+++ b/patch_info/log_connection_error.patch    2010-07-28 16:47:47.634070367 +0400
+diff -ruN /dev/null b/patch_info/log_connection_error.patch
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ b/patch_info/log_connection_error.patch    2011-04-09 18:48:54.000000000 +0400
 @@ -0,0 +1,6 @@
 +File=log_connection_error.patch
 +Name=logging abandoned connections
@@ -16,9 +16,9 @@ diff -ruN a/patch_info/log_connection_error.patch b/patch_info/log_connection_er
 +License=GPL
 +Comment=
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc    2010-07-28 16:47:47.105319218 +0400
-+++ b/sql/mysqld.cc    2010-07-28 16:47:47.644101813 +0400
-@@ -5011,6 +5011,10 @@
+--- a/sql/mysqld.cc    2011-04-09 18:48:53.000000000 +0400
++++ b/sql/mysqld.cc    2011-04-09 18:48:54.000000000 +0400
+@@ -5044,6 +5044,10 @@
  
      DBUG_PRINT("error",("Too many connections"));
      close_connection(thd, ER_CON_COUNT_ERROR);
@@ -29,7 +29,7 @@ diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
      delete thd;
      DBUG_VOID_RETURN;
    }
-@@ -5391,6 +5395,10 @@
+@@ -5424,6 +5428,10 @@
      if (!(thd->net.vio= vio_new_win32pipe(hConnectedPipe)) ||
        my_net_init(&thd->net, thd->net.vio))
      {
@@ -40,7 +40,7 @@ diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
        close_connection(thd, ER_OUT_OF_RESOURCES);
        delete thd;
        continue;
-@@ -5586,6 +5594,10 @@
+@@ -5619,6 +5627,10 @@
                                                     event_conn_closed)) ||
                          my_net_init(&thd->net, thd->net.vio))
      {