18125113 mysql Python module needs updates ... (revert accidentally included file)
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 29 Jan 2014 14:07:42 -0800
changeset 1674 2f4f37df32e3
parent 1673 f4a923835a61
child 1675 0eb3c8a5ca75
18125113 mysql Python module needs updates ... (revert accidentally included file)
components/rsyslog/patches/tcp-restart.patch
--- a/components/rsyslog/patches/tcp-restart.patch	Wed Jan 29 13:44:48 2014 -0800
+++ b/components/rsyslog/patches/tcp-restart.patch	Wed Jan 29 14:07:42 2014 -0800
@@ -4,8 +4,8 @@
 # on the upstream patch, adapted for 6.2.0 .  This can go away once we
 # upgrade to 6.4.1 or later.
 --- rsyslog/runtime/netstrm.c.orig	2012-01-09 06:05:45.000000000 -0800
-+++ rsyslog/runtime/netstrm.c	2014-01-29 10:16:47.131765870 -0800
[email protected]@ -250,11 +250,13 @@
++++ rsyslog/runtime/netstrm.c	2013-12-02 09:14:19.766000221 -0800
[email protected]@ -250,7 +250,7 @@
  
  
  /* check connection - slim wrapper for NSD driver function */
@@ -13,14 +13,7 @@
 +static rsRetVal
  CheckConnection(netstrm_t *pThis)
  {
-+	DEFiRet;
  	ISOBJ_TYPE_assert(pThis, netstrm);
--	pThis->Drvr.CheckConnection(pThis->pDrvrData);
-+	iRet = pThis->Drvr.CheckConnection(pThis->pDrvrData);
-+	RETiRet;
- }
- 
- 
 --- rsyslog/runtime/netstrm.h~	2011-12-01 02:26:19.000000000 -0800
 +++ rsyslog/runtime/netstrm.h	2013-12-02 09:30:45.155766988 -0800
 @@ -53,7 +53,7 @@