From bfcaea41c0d093ac7247be1c33ba9c9f2e5b21a0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 11 Jun 2010 15:29:54 +0000 Subject: [PATCH] Monotone-Parent: 042413fc9f6d6f7d0f5a07e28b0593ea59f38b07 Monotone-Revision: fc267c7dc09cc05decc140411d1facce3f441866 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-06-11T15:29:54 Monotone-Branch: ca.inverse.sogo --- SOPE/sope-patchset-r1664.diff | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/SOPE/sope-patchset-r1664.diff b/SOPE/sope-patchset-r1664.diff index 683c7c3aa..1860c796a 100644 --- a/SOPE/sope-patchset-r1664.diff +++ b/SOPE/sope-patchset-r1664.diff @@ -391,6 +391,22 @@ Index: sope-ldap/NGLdap/NGLdapConnection.h /* query parameters */ - (void)setQueryTimeLimit:(NSTimeInterval)_timeLimit; +Index: sope-gdl1/MySQL/MySQL4Channel.m +=================================================================== +--- sope-gdl1/MySQL/MySQL4Channel.m (revision 1664) ++++ sope-gdl1/MySQL/MySQL4Channel.m (working copy) +@@ -635,10 +635,10 @@ + if ((merrno = mysql_errno(self->_connection)) != 0) { + const char *error; + ++ error = mysql_error(self->_connection); + if (isDebuggingEnabled) + NSLog(@"%@ cannot use result: '%s'", self, error); + +- error = mysql_error(self->_connection); + return [MySQL4Exception exceptionWithName:@"FetchFailed" + reason:[NSString stringWithUTF8String:error] + userInfo:nil]; Index: sope-gdl1/Oracle8/ChangeLog =================================================================== --- sope-gdl1/Oracle8/ChangeLog (revision 1664)