Merge branch 'PHP-5.5'

faizshukri · faizshukri · commit 3ad32ef12a4b · 2013-02-22T13:50:13.000+01:00
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
@@ -1111,7 +1111,7 @@ PHP_FUNCTION(mysqli_begin_transaction)
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for parameter flags (%ld)", flags);
 		err = TRUE;
 	}
-	if (!name || !name_len) {
+	if (!name_len) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Savepoint name cannot be empty");
 		err = TRUE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1111,7 +1111,7 @@ PHP_FUNCTION(mysqli_begin_transaction)`
`1111`	`1111`	`php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for parameter flags (%ld)", flags);`
`1112`	`1112`	`err = TRUE;`
`1113`	`1113`	`}`
`1114`		`- if (!name \|\| !name_len) {`
	`1114`	`+ if (!name_len) {`
`1115`	`1115`	`php_error_docref(NULL TSRMLS_CC, E_WARNING, "Savepoint name cannot be empty");`
`1116`	`1116`	`err = TRUE;`
`1117`	`1117`	`}`