From c1879099e1a7782842d52ad4eed082e2e713ff85 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Tue, 21 Aug 2007 06:35:24 +0100
Subject: [PATCH] mysql: disable utf8

---
 backend.php                   | 4 ++--
 opml.php                      | 4 ++--
 schema/ttrss_schema_mysql.sql | 4 ++--
 update.php                    | 4 ++--
 update_daemon.php             | 4 ++--
 update_feeds.php              | 4 ++--
 xml-rpc.php                   | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend.php b/backend.php
index c5757a2ff..bbfa8ca23 100644
--- a/backend.php
+++ b/backend.php
@@ -50,8 +50,8 @@
 		pg_query("set client_encoding = 'UTF-8'");
 		pg_set_client_encoding("UNICODE");
 	} else {
-		db_query($link, "SET NAMES utf8");
-		db_query($link, "SET CHARACTER SET utf8");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	$op = $_REQUEST["op"];
diff --git a/opml.php b/opml.php
index ac236a64b..f5655cb31 100644
--- a/opml.php
+++ b/opml.php
@@ -14,8 +14,8 @@
 		pg_query($link, "set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
 	} else {
-		db_query($link, "SET NAMES utf8");
-		db_query($link, "SET CHARACTER SET utf8");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	login_sequence($link);
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 28e3b4efd..e55038b7f 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -1,5 +1,5 @@
-SET NAMES utf8;
-SET CHARACTER SET utf8;
+-- SET NAMES utf8;
+-- SET CHARACTER SET utf8;
 
 drop table if exists ttrss_version;
 drop table if exists ttrss_labels;
diff --git a/update.php b/update.php
index e15e3be00..e74e3e8ff 100644
--- a/update.php
+++ b/update.php
@@ -14,8 +14,8 @@
 		pg_query($link, "set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
 	} else {
-		db_query($link, "SET NAMES utf8");
-		db_query($link, "SET CHARACTER SET utf8");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	login_sequence($link);
diff --git a/update_daemon.php b/update_daemon.php
index 25ef6a993..c2738e48b 100644
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -66,8 +66,8 @@
 		pg_query("set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
 	} else {
-		db_query($link, "SET NAMES utf8");
-		db_query($link, "SET CHARACTER SET utf8");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	$last_purge = 0;
diff --git a/update_feeds.php b/update_feeds.php
index aa07321e6..2fd74ef16 100644
--- a/update_feeds.php
+++ b/update_feeds.php
@@ -27,8 +27,8 @@
 		pg_query("set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
 	} else {
-		db_query($link, "SET NAMES utf8");
-		db_query($link, "SET CHARACTER SET utf8");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	$result = db_query($link, "SELECT id FROM ttrss_users");
diff --git a/xml-rpc.php b/xml-rpc.php
index d61382c08..21237f6c1 100644
--- a/xml-rpc.php
+++ b/xml-rpc.php
@@ -23,8 +23,8 @@
 		pg_query("set client_encoding = 'utf-8'");
 		pg_set_client_encoding("UNICODE");
 	} else {
-		db_query($link, "SET NAMES utf8");
-		db_query($link, "SET CHARACTER SET utf8");
+//		db_query($link, "SET NAMES utf8");
+//		db_query($link, "SET CHARACTER SET utf8");
 	}
 
 	function getVirtualFeeds($msg) {