Author: glen Date: Sat Feb 20 00:00:47 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- typos
---- Files affected:
packages/php:
php-mysql-charsetphpini.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/php/php-mysql-charsetphpini.patch
diff -u packages/php/php-mysql-charsetphpini.patch:1.4
packages/php/php-mysql-charsetphpini.patch:1.5
--- packages/php/php-mysql-charsetphpini.patch:1.4 Sat Feb 20 00:17:55 2010
+++ packages/php/php-mysql-charsetphpini.patch Sat Feb 20 01:00:42 2010
@@ -40,7 +40,7 @@
}
+
+ if (connect_charset != NULL)
-+ mysql_options(&mysql->conn,
MYSQL_SET_CHARSET_NAME, connect_charset);
++ mysql_options(mysql->conn,
MYSQL_SET_CHARSET_NAME, connect_charset);
+
#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn, host, user, passwd,
NULL, port, socket, client_flags)==NULL)
@@ -59,7 +59,7 @@
mysql_options(mysql->conn,
MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
+ if (connect_charset != NULL)
-+ mysql_options(&mysql->conn, MYSQL_SET_CHARSET_NAME,
connect_charset);
++ mysql_options(mysql->conn, MYSQL_SET_CHARSET_NAME,
connect_charset);
+
#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn, host, user, passwd, NULL,
port, socket, client_flags)==NULL)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-mysql-charsetphpini.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
