summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc2
-rw-r--r--sql/sql_binlog.cc2
2 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 1fa08a1d862..4d4eadd0ed9 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1883,9 +1883,11 @@ static void init_signals(void)
static void start_signal_handler(void)
{
+#ifndef EMBEDDED_LIBRARY
// Save vm id of this process
if (!opt_bootstrap)
create_pid_file();
+#endif /* EMBEDDED_LIBRARY */
}
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc
index 77432ce518e..87224b8eea0 100644
--- a/sql/sql_binlog.cc
+++ b/sql/sql_binlog.cc
@@ -172,6 +172,7 @@ void mysql_client_binlog_statement(THD* thd)
not used at all: the rli_fake instance is used only for error
reporting.
*/
+#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
if (IF_DBUG(int err= ) ev->apply_event(thd->rli_fake))
{
DBUG_PRINT("info", ("apply_event() returned: %d", err));
@@ -182,6 +183,7 @@ void mysql_client_binlog_statement(THD* thd)
my_error(ER_UNKNOWN_ERROR, MYF(0), "Error executing BINLOG statement");
goto end;
}
+#endif
delete ev;
ev= 0;