summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/Makefile.am4
-rw-r--r--client/client_priv.h1
-rw-r--r--client/mysqlbinlog.cc2
3 files changed, 3 insertions, 4 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index 1cd85c5840a..5da59296cdf 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -103,13 +103,13 @@ DEFS = -DMYSQL_CLIENT_NO_THREADS \
-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
-DMYSQL_DATADIR="\"$(localstatedir)\""
-sql_src=log_event.h mysql_priv.h rpl_constants.h \
+sql_src=log_event.h sql_priv.h rpl_constants.h \
rpl_tblmap.h rpl_tblmap.cc \
log_event.cc my_decimal.h my_decimal.cc \
log_event_old.h log_event_old.cc \
rpl_record_old.h rpl_record_old.cc \
rpl_utility.h rpl_utility.cc \
- transaction.h
+ transaction.h sql_const.h
strings_src=decimal.c dtoa.c
link_sources:
diff --git a/client/client_priv.h b/client/client_priv.h
index 799f6aaec2f..b0991c0134f 100644
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -19,7 +19,6 @@
#include <my_sys.h>
#include <m_string.h>
#include <mysql.h>
-#include <mysql_embed.h>
#include <errmsg.h>
#include <my_getopt.h>
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 537567cbe4e..410d3a875d7 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -31,7 +31,7 @@
#include "client_priv.h"
#include <my_time.h>
/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */
-#include "mysql_priv.h"
+#include "sql_priv.h"
#include "log_event.h"
#include "sql_common.h"