From aab055a485b21666e574a23cea4de59d602147f2 Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Tue, 28 Aug 2007 15:22:14 +0200
Subject: [PATCH 1/2] build fix for aix and others

---
 libmysql/libmysql.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 85c56a7ea40..1c82a5152b4 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -4681,14 +4681,14 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
   MYSQL_ROWS *cur, **prev_ptr= &result->data;
   NET        *net;
 
+  DBUG_ENTER("cli_read_binary_rows");
+  
   if (!mysql)
   {
     set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
-    return 1;
+    DBUG_RETURN(1);
   }
 
-  DBUG_ENTER("cli_read_binary_rows");
-
   net = &mysql->net;
   mysql= mysql->last_used_con;
 

From bc4e9689815e4d4f4cc41bc11ab48cead60b707f Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Tue, 28 Aug 2007 16:06:08 +0200
Subject: [PATCH 2/2] fix bug in test case for bug#25714

---
 mysql-test/include/have_bug25714.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/include/have_bug25714.inc b/mysql-test/include/have_bug25714.inc
index 0c995cd0d4c..0c09ae1a035 100644
--- a/mysql-test/include/have_bug25714.inc
+++ b/mysql-test/include/have_bug25714.inc
@@ -3,5 +3,5 @@
 #
 --require r/have_bug25714.require
 disable_query_log;
-eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe";
+eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe";
 enable_query_log;