- Sync with 5.3

diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c
index fcb6975ff5f65e23cb423faf77b274ccccca01bf..0644b0f09c26bd06dc30a4c6bd9ec4d9b4225111 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result_meta.c
+++ b/ext/mysqlnd/mysqlnd_result_meta.c
@@ -143,8 +143,10 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met
 {
        unsigned int i = 0;
        php_mysql_packet_res_field field_packet;
+#if PHP_MAJOR_VERSION >= 6
        UChar *ustr;
        int ulen;
+#endif
 
        DBG_ENTER("mysqlnd_res_meta::read_metadata");
 

diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c
index 0807b3d0175c0f62ee895a7ffa031eabace1f338..4e6089b915934c15213f0f351dd0d1e8f49b4f09 100644 (file)
--- a/ext/mysqlnd/mysqlnd_statistics.c
+++ b/ext/mysqlnd/mysqlnd_statistics.c
@@ -164,21 +164,20 @@ mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval *return_value TS
 
        mysqlnd_array_init(return_value, STAT_LAST);
        for (i = 0; i < STAT_LAST; i++) {
+#if PHP_MAJOR_VERSION >= 6
+               UChar *ustr, *tstr;
+               int ulen, tlen;
+#endif
                char tmp[22];
                
                sprintf((char *)&tmp, MYSQLND_LLU_SPEC, stats->values[i]);
 #if PHP_MAJOR_VERSION >= 6
-               {
-                       UChar *ustr, *tstr;
-                       int ulen, tlen;
-
-                       zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, mysqlnd_stats_values_names[i].s,
-                                                                       mysqlnd_stats_values_names[i].l + 1 TSRMLS_CC);
-                       zend_string_to_unicode(UG(utf8_conv), &tstr, &tlen, tmp, strlen(tmp) + 1 TSRMLS_CC);
-                       add_u_assoc_unicode_ex(return_value, IS_UNICODE, ZSTR(ustr), ulen, tstr, 1);
-                       efree(ustr);
-                       efree(tstr);
-               }
+               zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, mysqlnd_stats_values_names[i].s,
+                                                               mysqlnd_stats_values_names[i].l + 1 TSRMLS_CC);
+               zend_string_to_unicode(UG(utf8_conv), &tstr, &tlen, tmp, strlen(tmp) + 1 TSRMLS_CC);
+               add_u_assoc_unicode_ex(return_value, IS_UNICODE, ZSTR(ustr), ulen, tstr, 1);
+               efree(ustr);
+               efree(tstr);
 #else
                add_assoc_string_ex(return_value, mysqlnd_stats_values_names[i].s,
                                                        mysqlnd_stats_values_names[i].l + 1, tmp, 1);