diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 08:50:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 08:50:33 +0200 |
| commit | 9c18b9660302a76a6ff9bd505888048a13586a4c (patch) | |
| tree | 8f0cd57e97ccca5f633825863e9e0f8e705ed8ff /client | |
| parent | d8d6e995282dd9485f65517efbb684eabaf52322 (diff) | |
| parent | 47ab793d71f2755b026672e4657174a1740b6ae2 (diff) | |
| download | mariadb-git-9c18b9660302a76a6ff9bd505888048a13586a4c.tar.gz | |
Merge 10.4 into 10.5
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 a606decb350..00590868309 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, 2020, 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 @@ -91,10 +91,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 |