summaryrefslogtreecommitdiff
path: root/mysys/base64.c
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-30 12:48:42 +0200
committerSergei Golubchik <serg@mariadb.org>2017-03-30 12:48:42 +0200
commitda4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch)
tree7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /mysys/base64.c
parent9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff)
parenta00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff)
downloadmariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysys/base64.c')
-rw-r--r--mysys/base64.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/base64.c b/mysys/base64.c
index 67a9a13120b..b156406474d 100644
--- a/mysys/base64.c
+++ b/mysys/base64.c
@@ -17,7 +17,6 @@
#include <my_global.h>
#include <m_string.h> /* strchr() */
#include <m_ctype.h> /* my_isspace() */
-#include <base64.h>
#ifndef MAIN