PHP mysqlnd svn commit: r111 - trunk/ext/mysqli/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-03-13 09:51:31 +0100 (Tue, 13 Mar 2007)
New Revision: 111

Modified:
   trunk/ext/mysqli/mysqlnd/mysqlnd_ps_codec.c
Log:
Fallback to non-unicode but mark where we need unicode


Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_ps_codec.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_ps_codec.c	2007-03-13 08:36:26 UTC (rev 110)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_ps_codec.c	2007-03-13 08:51:31 UTC (rev 111)
@@ -120,10 +120,14 @@
 			} while (--j > 0);
 			tmp[10]= '\0';
 			/* unsigned int > INT_MAX is 10 digits - ALWAYS */
+#ifdef WE_USE_UNICODE
 			ZVAL_UTF8_STRINGL(zv, tmp, 10, 0);
 			if (UG(unicode)) {
 				efree(tmp);
 			}
+#else
+			ZVAL_STRING(zv, tmp, 0);
+#endif
 		} else {
 			ZVAL_LONG(zv, uval);
 		}
@@ -155,8 +159,11 @@
 		 * use MYSQLND_LL_SPEC.
 		 */
 		sprintf((char *)&tmp, uns == TRUE? MYSQLND_LLU_SPEC : MYSQLND_LL_SPEC, llval);
-//		ZVAL_UTF8_STRING(zv, tmp, ZSTR_DUPLICATE);
+#ifdef WE_USE_UNICODE
+		ZVAL_UTF8_STRING(zv, tmp, ZSTR_DUPLICATE);
+#else
 		ZVAL_STRING(zv, tmp, 1);
+#endif
 	} else {
 		ZVAL_LONG(zv, llval);
 	}