From 1e711c8d0471d509ec1c981bd353dfe1150fdd39 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mnogosearch.org>
Date: Thu, 12 Dec 2013 17:26:01 +0400
Subject: [PATCH] ConnectSE: making odbc_postgresql.test independent from the
 system locale (on Linux) and code pages (on Windows).

---
 storage/connect/mysql-test/connect/my.cnf                 | 2 ++
 storage/connect/mysql-test/connect/t/odbc_postgresql.sql  | 4 +++-
 storage/connect/mysql-test/connect/t/odbc_postgresql.test | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/storage/connect/mysql-test/connect/my.cnf b/storage/connect/mysql-test/connect/my.cnf
index 124047fb792..317e20012ba 100644
--- a/storage/connect/mysql-test/connect/my.cnf
+++ b/storage/connect/mysql-test/connect/my.cnf
@@ -13,3 +13,5 @@ MASTER_MYSOCK=           @mysqld.1.socket
 
 SLAVE_MYPORT=            @mysqld.2.port
 SLAVE_MYSOCK=            @mysqld.2.socket
+
+PGCLIENTENCODING=        UTF8
diff --git a/storage/connect/mysql-test/connect/t/odbc_postgresql.sql b/storage/connect/mysql-test/connect/t/odbc_postgresql.sql
index b7419027779..1c302294393 100644
--- a/storage/connect/mysql-test/connect/t/odbc_postgresql.sql
+++ b/storage/connect/mysql-test/connect/t/odbc_postgresql.sql
@@ -2,7 +2,9 @@
 -- The SQL script to create PostgreSQL data for odbc_postgresql.test
 --
 -- Run this script as a admin user:
--- sudo -u postgres psql < odbc_postgresql.create.sql
+-- psql -U postgres < odbc_postgresql.sql
+
+SET NAMES 'UTF8';
 
 DROP DATABASE IF EXISTS mtr;
 DROP USER IF EXISTS mtr;
diff --git a/storage/connect/mysql-test/connect/t/odbc_postgresql.test b/storage/connect/mysql-test/connect/t/odbc_postgresql.test
index 92c78cf0feb..b80135e6167 100644
--- a/storage/connect/mysql-test/connect/t/odbc_postgresql.test
+++ b/storage/connect/mysql-test/connect/t/odbc_postgresql.test
@@ -8,7 +8,7 @@
 # 1. Install and configure PostgreSQL database to stat on the system startup
 #
 # 2. Create user, database, schema and tables to be used by mtr:
-#    sudo -u postgres < odbc_postgresql.sql
+#    psql -U postgres < odbc_postgresql.sql
 #
 # 3. Install PostgreSQL ODBC Driver.
 # - On CentOS, Fedora: