diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-30 12:36:02 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-30 12:36:02 +0400 |
| commit | 862af4eeaaa89ea4f09491359d0a2dab77399924 (patch) | |
| tree | ab80a4adf55d51918222049bf766de8464b93e2b /client | |
| parent | a87059b9406b2fbdf8d890220821e64e1767717a (diff) | |
| parent | 2c89cb23af5c3d97794e02857a9abb436c84baa5 (diff) | |
| download | mariadb-git-862af4eeaaa89ea4f09491359d0a2dab77399924.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 5 |
1 files changed, 1 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 '\\' |