Commit e4da0b0a authored by Alexey Botchkov's avatar Alexey Botchkov

merging.

parents bf78f476 15ee13fb
...@@ -93,6 +93,7 @@ extern "C" { ...@@ -93,6 +93,7 @@ extern "C" {
#else #else
#include <readline/readline.h> #include <readline/readline.h>
#define HAVE_READLINE #define HAVE_READLINE
#define USE_POPEN
#endif #endif
//int vidattr(long unsigned int attrs); // Was missing in sun curses //int vidattr(long unsigned int attrs); // Was missing in sun curses
} }
...@@ -108,10 +109,6 @@ extern "C" { ...@@ -108,10 +109,6 @@ extern "C" {
#define cmp_database(cs,A,B) strcmp((A),(B)) #define cmp_database(cs,A,B) strcmp((A),(B))
#endif #endif
#if !defined(__WIN__) && !defined(THREAD)
#define USE_POPEN
#endif
#include "completion_hash.h" #include "completion_hash.h"
#define PROMPT_CHAR '\\' #define PROMPT_CHAR '\\'
......
...@@ -432,5 +432,8 @@ Bug #47147: mysql client option --skip-column-names does not apply to vertical o ...@@ -432,5 +432,8 @@ Bug #47147: mysql client option --skip-column-names does not apply to vertical o
*************************** 1. row *************************** *************************** 1. row ***************************
1 1
Bug #54466 client 5.5 built from source lacks "pager" support
a
1
End of tests End of tests
...@@ -425,5 +425,11 @@ drop table t1; ...@@ -425,5 +425,11 @@ drop table t1;
--echo --echo
--exec $MYSQL --skip-column-names --vertical test -e "select 1 as a" --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
--echo End of tests --echo End of tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment