From 3d131a9a766139976145d0f76ed824394b398c81 Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 20 Apr 2005 21:34:24 +0000 Subject: [PATCH] made utf-8 set a warning git-svn-id: http://svn.opengroupware.org/SOPE/trunk@745 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-gdl1/MySQL/ChangeLog | 3 +++ sope-gdl1/MySQL/MySQL4Channel.m | 4 +++- sope-gdl1/MySQL/Version | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sope-gdl1/MySQL/ChangeLog b/sope-gdl1/MySQL/ChangeLog index ada62446..846b4f3e 100644 --- a/sope-gdl1/MySQL/ChangeLog +++ b/sope-gdl1/MySQL/ChangeLog @@ -1,5 +1,8 @@ 2005-04-20 Helge Hess + * MySQL4Channel.m: only warn if the character set could not be changed + to UTF-8 (v4.5.8) + * renamed MySQL4 adaptor to MySQL to avoid confusion (v4.5.7) 2005-04-19 Helge Hess diff --git a/sope-gdl1/MySQL/MySQL4Channel.m b/sope-gdl1/MySQL/MySQL4Channel.m index daf76a9e..519c74ed 100644 --- a/sope-gdl1/MySQL/MySQL4Channel.m +++ b/sope-gdl1/MySQL/MySQL4Channel.m @@ -171,11 +171,13 @@ static int openConnectionCount = 0; } if (mysql_query(self->_connection, "SET CHARACTER SET utf8") != 0) { - NSLog(@"ERROR(%s): could not put MySQL4 connection into UTF-8 mode: %s", + NSLog(@"WARNING(%s): could not put MySQL4 connection into UTF-8 mode: %s", __PRETTY_FUNCTION__, mysql_error(self->_connection)); +#if 0 mysql_close(self->_connection); self->_connection = NULL; return NO; +#endif } if (isDebuggingEnabled) diff --git a/sope-gdl1/MySQL/Version b/sope-gdl1/MySQL/Version index 8726fcae..edfa2d83 100644 --- a/sope-gdl1/MySQL/Version +++ b/sope-gdl1/MySQL/Version @@ -1,3 +1,3 @@ # Version file -SUBMINOR_VERSION:=7 +SUBMINOR_VERSION:=8 -- 2.39.5