diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 16:38:04 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 16:38:04 -0300 |
| commit | 74283a052e092d822091343dc236debf0aaf55cc (patch) | |
| tree | 3c6e29d5a9d1f0a067dcdf4cca5b5747721aee89 /client/mysql.cc | |
| parent | 02de8f68a5a0fcf4ff9df6014b3c49a0cba9183d (diff) | |
| parent | 93fb8bb23544a4b5b2a4a6e43e1c25d74ca9a6f0 (diff) | |
| download | mariadb-git-74283a052e092d822091343dc236debf0aaf55cc.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 58ef51f3fff..e605d517d2c 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -88,7 +88,6 @@ extern "C" { #endif #endif -#undef bcmp // Fix problem with new readline #if defined(__WIN__) #include <conio.h> #elif !defined(__NETWARE__) |