From: Johannes Schlüter <johannes@php.net>
Date: Tue, 19 Aug 2008 10:15:56 +0000 (+0000)
Subject: Fix empty error message when connecting to a bad server
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~650
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a11121e8df66579fd106315891ade08994584571;p=php

Fix empty error message when connecting to a bad server
---

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index fb57ca70f5..0479095642 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -58,7 +58,7 @@ extern MYSQLND_CHARSET *mysqlnd_charsets;
 
 
 
-
+const char * mysqlnd_old_passwd  = "mysqlnd cannot connect to MySQL 4.1+ using old authentication";
 const char * mysqlnd_server_gone = "MySQL server has gone away";
 const char * mysqlnd_out_of_sync = "Commands out of sync; you can't run this command now";
 
@@ -692,8 +692,8 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn,
 	if (FAIL == PACKET_READ_ALLOCA(ok_packet, conn) || ok_packet.field_count >= 0xFE) {
 		if (ok_packet.field_count == 0xFE) {
 			/* old authentication with new server  !*/
-			DBG_ERR("mysqlnd cannot connect to MySQL 4.1+ using old authentication");
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "mysqlnd cannot connect to MySQL 4.1+ using old authentication");
+			DBG_ERR(mysqlnd_old_passwd);
+			SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, mysqlnd_old_passwd);
 		} else if (ok_packet.field_count == 0xFF) {
 			if (ok_packet.sqlstate[0]) {
 				if (!self_alloced) {