Merge branch 'PHP-5.5' into PHP-5.6

faizshukri · faizshukri · commit f5deb18b205f · 2014-07-31T21:28:09.000+03:00
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -226,7 +226,7 @@ php_mysqlnd_net_store_length_size(uint64_t length)
 	if (length < (uint64_t) L64(16777216)) {
 		return 4;
 	}
-	return 8;
+	return 9;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ php_mysqlnd_net_store_length_size(uint64_t length)`
`226`	`226`	`if (length < (uint64_t) L64(16777216)) {`
`227`	`227`	`return 4;`
`228`	`228`	`}`
`229`		`- return 8;`
	`229`	`+ return 9;`
`230`	`230`	`}`
`231`	`231`	`/* }}} */`
`232`	`232`