com php-src: fix merge artifact: ext/mysql/php_mysql.c
| From: | Antony Dovgal | Date: | Thu, 12 Dec 2013 08:47:42 +0000 |
| Subject: | com php-src: fix merge artifact: ext/mysql/php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76642@lists.php.net to get a copy of this message | ||
Commit: 8d5f20e32ae617a9761e2cd3da917ea76626f846
Author: Antony Dovgal <tony2001@php.net> Wed, 7 Aug 2013 14:29:51 +0400
Parents: ecbf8fcb8466410e89aaf235135c4149aab59edb
Branches: badoo-5.5_mysqlnd
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8d5f20e32ae617a9761e2cd3da917ea76626f846
Log:
fix merge artifact
Changed paths:
M ext/mysql/php_mysql.c
Diff:
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index aaf1344..edc504d 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1017,10 +1017,6 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int
persistent)
mysql->multi_query = 1;
#endif
- if (MySG(default_charset) != NULL) {
- mysql_options(mysql->conn, MYSQL_SET_CHARSET_NAME, (const char *) MySG(default_charset));
- }
-
#ifndef MYSQL_USE_MYSQLND
mysql->conn = mysql_init(NULL);
#else
@@ -1038,6 +1034,10 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int
persistent)
mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
}
+ if (MySG(default_charset) != NULL) {
+ mysql_options(mysql->conn, MYSQL_SET_CHARSET_NAME, (const char *) MySG(default_charset));
+ }
+
#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket,
client_flags)==NULL)
#else