diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 08:26:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 08:26:59 +0200 |
| commit | 524b4a89da3d9143ad72a82d73617ffde9e3a7a8 (patch) | |
| tree | 4365b284812f3ea742b0d7bb96f2447c3c657b54 /client | |
| parent | f7054ff5dfea7b84afdde11c14898cff7154521e (diff) | |
| parent | d6d1a1fc21084c81a0795a26e67577c2a718f6ea (diff) | |
| download | mariadb-git-524b4a89da3d9143ad72a82d73617ffde9e3a7a8.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 31b56441f23..e1069017c82 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2018, Oracle and/or its affiliates. - Copyright (c) 2009, 2019, MariaDB Corporation. + Copyright (c) 2009, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -90,10 +90,14 @@ extern "C" { #if defined(__WIN__) #include <conio.h> #else -#include <readline.h> -#if !defined(USE_LIBEDIT_INTERFACE) -#include <history.h> -#endif +# ifdef __APPLE__ +# include <editline/readline.h> +# else +# include <readline.h> +# if !defined(USE_LIBEDIT_INTERFACE) +# include <history.h> +# endif +# endif #define HAVE_READLINE #define USE_POPEN #endif |