PHP mysqlnd svn commit: r1264 - trunk/mysqlnd

[uwendel]

Author: uwendel
Date: 2008-02-07 20:27:54 +0100 (Thu, 07 Feb 2008)
New Revision: 1264

Modified:
   trunk/mysqlnd/mysqlnd_debug.c
Log:
Making the parser behave more like libmysql/the server.



Modified: trunk/mysqlnd/mysqlnd_debug.c
===================================================================
--- trunk/mysqlnd/mysqlnd_debug.c	2008-02-07 15:44:06 UTC (rev 1263)
+++ trunk/mysqlnd/mysqlnd_debug.c	2008-02-07 19:27:54 UTC (rev 1264)
@@ -433,7 +433,8 @@
 					}
 					i = j;
 				} else {
-					self->file_name = (char *) mysqlnd_debug_default_trace_file;
+					if (!self->file_name)
+						self->file_name = (char *) mysqlnd_debug_default_trace_file;
 				}
 				state = PARSER_WAIT_COLON;
 				break;
@@ -491,9 +492,10 @@
 				if ((i + 1) < mode_len && mode[i+1] == ',') {
 					i+= 2;
 					while (i < mode_len) {
-						if (mode[i++] == ':') {
+						if (mode[i] == ':') {
 							break;
 						}
+						i++;
 					}
 				}
 				state = PARSER_WAIT_COLON;