X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-pdo_mysql-charsetphpini.patch;h=36a7c95da77f370d65bcc0f61cc2cde8887ad696;hb=95f70ac8534432048f1974019a5a62d88a12fe89;hp=b0b0333c99700d57be4fbb1732b34754f5d45b2d;hpb=25e7e080c5ae233afa6051ff66020e2261834610;p=packages%2Fphp.git

diff --git a/php-pdo_mysql-charsetphpini.patch b/php-pdo_mysql-charsetphpini.patch
index b0b0333..36a7c95 100644
--- a/php-pdo_mysql-charsetphpini.patch
+++ b/php-pdo_mysql-charsetphpini.patch
@@ -26,8 +26,8 @@ small.
  	if (mysqlnd_connect(H->server, host, dbh->username, dbh->password, password_len, dbname, dbname_len,
  						port, unix_socket, connect_opts, PDO_MYSQL_G(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL) {
  #else
---- php-5.3.2RC3/ext/pdo_mysql/pdo_mysql.c~	2010-02-04 11:37:38.000000000 +0200
-+++ php-5.3.2RC3/ext/pdo_mysql/pdo_mysql.c	2010-02-26 19:09:36.784902389 +0200
+--- php-5.3.3/ext/pdo_mysql/pdo_mysql.c~	2010-07-24 19:23:14.000000000 +0300
++++ php-5.3.3/ext/pdo_mysql/pdo_mysql.c	2010-07-24 19:24:48.363581841 +0300
 @@ -56,6 +56,7 @@
  #if PDO_DBG_ENABLED
  	STD_PHP_INI_ENTRY("pdo_mysql.debug",	NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)
@@ -46,58 +46,13 @@ small.
  
  	return SUCCESS;
  }
-@@ -108,9 +107,7 @@
- 
- 	php_info_print_table_end();
- 
--#ifdef PDO_USE_MYSQLND
- 	DISPLAY_INI_ENTRIES();
--#endif
- }
- /* }}} */
- 
-@@ -154,10 +151,13 @@
- /* }}} */
- 
- 
-+#endif /* PDO_USE_MYSQLND */
-+
- /* {{{ PHP_GINIT_FUNCTION
-  */
- static PHP_GINIT_FUNCTION(pdo_mysql)
- {
-+#ifdef PDO_USE_MYSQLND
- #ifndef PHP_WIN32
- 	pdo_mysql_globals->default_socket = NULL;
- #endif
-@@ -165,10 +165,10 @@
+@@ -161,6 +161,7 @@
  	pdo_mysql_globals->debug = NULL;	/* The actual string */
  	pdo_mysql_globals->dbg = NULL;	/* The DBG object*/
  #endif
-+#endif /* PDO_USE_MYSQLND */
 +	pdo_mysql_globals->connect_charset = NULL;
  }
  /* }}} */
--#endif
--
- 
- /* {{{ pdo_mysql_functions[] */
- const zend_function_entry pdo_mysql_functions[] = {
-@@ -205,15 +205,11 @@
- #endif
- 	PHP_MINFO(pdo_mysql),
- 	"1.0.2",
--#if PDO_USE_MYSQLND
- 	PHP_MODULE_GLOBALS(pdo_mysql),
- 	PHP_GINIT(pdo_mysql),
- 	NULL,
- 	NULL,
- 	STANDARD_MODULE_PROPERTIES_EX
--#else
--	STANDARD_MODULE_PROPERTIES
--#endif
- };
- /* }}} */
  
 --- php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h~	2010-02-04 11:37:38.000000000 +0200
 +++ php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h	2010-02-26 19:11:47.484055898 +0200