made utf-8 set a warning

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@745 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-gdl1/MySQL/ChangeLog b/sope-gdl1/MySQL/ChangeLog
index ada6244622483c74ad58a28d8098aaaa3f56b43e..846b4f3e0bc75033fedb598098a80be62f180d19 100644 (file)
--- a/sope-gdl1/MySQL/ChangeLog
+++ b/sope-gdl1/MySQL/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-20  Helge Hess  <helge.hess@opengroupware.org>
 
+       * 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  <helge.hess@skyrix.com>

diff --git a/sope-gdl1/MySQL/MySQL4Channel.m b/sope-gdl1/MySQL/MySQL4Channel.m
index daf76a9e100f37baf72bece1d72335fede5657ef..519c74ed95280450aea2286e9fb34fcebbd79ac4 100644 (file)
--- 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 8726fcae339eca6c845f5f805531991eca2ef8e2..edfa2d83990815e5f39eca760dc9b0783f70be7d 100644 (file)
--- a/sope-gdl1/MySQL/Version
+++ b/sope-gdl1/MySQL/Version
@@ -1,3 +1,3 @@
 # Version file
 
-SUBMINOR_VERSION:=7
+SUBMINOR_VERSION:=8