From 2533ca9e6b0f12848b482f98445d7cc4aededa83 Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@mysql.com>
Date: Thu, 19 Aug 2010 16:35:47 +0500
Subject: [PATCH] Bug#54466      client 5.5 built from source lacks "pager"
 support               #ifdef THREAD removed from mysql.cc.                No
 reason was found for this limitation to persist.

per-file comments:
  client/mysql.cc
Bug#54466      client 5.5 built from source lacks "pager" support
        now we have USE_POPEN always if not __WIN__
  mysql-test/r/mysql.result
Bug#54466      client 5.5 built from source lacks "pager" support
        result updated.
  mysql-test/t/mysql.test
Bug#54466      client 5.5 built from source lacks "pager" support
        test case added.
---
 client/mysql.cc           | 5 +----
 mysql-test/r/mysql.result | 3 +++
 mysql-test/t/mysql.test   | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index 01a786c13af..b61a751198a 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -93,6 +93,7 @@ extern "C" {
 #else
 #include <readline/readline.h>
 #define HAVE_READLINE
+#define USE_POPEN
 #endif
   //int vidattr(long unsigned int attrs);	// Was missing in sun curses
 }
@@ -108,10 +109,6 @@ extern "C" {
 #define cmp_database(cs,A,B) strcmp((A),(B))
 #endif
 
-#if !defined(__WIN__) && !defined(THREAD)
-#define USE_POPEN
-#endif
-
 #include "completion_hash.h"
 
 #define PROMPT_CHAR '\\'
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 3c53faff526..88c74d4c497 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -432,5 +432,8 @@ Bug #47147: mysql client option --skip-column-names does not apply to vertical o
 
 *************************** 1. row ***************************
 1
+Bug #54466 client 5.5 built from source lacks "pager" support
+a
+1
 
 End of tests
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index 3a2084aef08..765ef31f9fd 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -425,5 +425,11 @@ drop table t1;
 --echo
 --exec $MYSQL --skip-column-names --vertical test -e "select 1 as a"
 
+#
+# Bug #54466 client 5.5 built from source lacks "pager" support
+# 
+--echo Bug #54466 client 5.5 built from source lacks "pager" support
+--exec $MYSQL --pager test -e "select 1 as a"
+
 --echo
 --echo End of tests
-- 
2.30.9