From: Andrey Hristov <andrey@php.net>
Date: Fri, 28 Sep 2012 09:58:41 +0000 (+0200)
Subject: fix login failure with empty password. This is 5.5 specific - new code
X-Git-Tag: php-5.5.0alpha1~45^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c540fe2064d23e7e9de665f12d5452ce914991ff;p=php

fix login failure with empty password. This is 5.5 specific - new code
---

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 3fa9d11a28..557924cdaf 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -582,8 +582,8 @@ mysqlnd_run_authentication(
 			scrambled_data =
 				auth_plugin->methods.get_auth_data(NULL, &scrambled_data_len, conn, user, passwd, passwd_len,
 												   plugin_data, plugin_data_len, options, &conn->net->data->options, mysql_flags TSRMLS_CC);
-			if (!scrambled_data || conn->error_info->error_no) {
-				goto end;			
+			if (conn->error_info->error_no) {
+				goto end;	
 			}
 			if (FALSE == is_change_user) {
 				ret = mysqlnd_auth_handshake(conn, user, passwd, passwd_len, db, db_len, options, mysql_flags,