From 4189ccf44a79d14c8faecefa8f87f8dde5dd492f Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 3 Dec 2008 14:48:26 +0000 Subject: [PATCH] - comment out setcharset() use in sqlite and mssql drivers (http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/mssql.php?r1=1.177&r2=1.178) --- program/lib/MDB2/Driver/mssql.php | 2 ++ program/lib/MDB2/Driver/sqlite.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/program/lib/MDB2/Driver/mssql.php b/program/lib/MDB2/Driver/mssql.php index a16e33cbe..027447b08 100644 --- a/program/lib/MDB2/Driver/mssql.php +++ b/program/lib/MDB2/Driver/mssql.php @@ -349,12 +349,14 @@ class MDB2_Driver_mssql extends MDB2_Driver_Common @mssql_query('SET ANSI_NULL_DFLT_ON ON', $connection); +/* if (!empty($this->dsn['charset'])) { $result = $this->setCharset($this->dsn['charset'], $connection); if (PEAR::isError($result)) { return $result; } } +*/ if ((bool)ini_get('mssql.datetimeconvert')) { @ini_set('mssql.datetimeconvert', '0'); diff --git a/program/lib/MDB2/Driver/sqlite.php b/program/lib/MDB2/Driver/sqlite.php index e48bac329..c8c485de6 100644 --- a/program/lib/MDB2/Driver/sqlite.php +++ b/program/lib/MDB2/Driver/sqlite.php @@ -412,12 +412,14 @@ class MDB2_Driver_sqlite extends MDB2_Driver_Common 'unable to establish a connection', __FUNCTION__); } +/* if (!empty($this->dsn['charset'])) { $result = $this->setCharset($this->dsn['charset'], $connection); if (PEAR::isError($result)) { return $result; } } +*/ $this->connection = $connection; $this->connected_dsn = $this->dsn;