diff options
author | unknown <hf@deer.mysql.r18.ru> | 2002-12-16 18:58:55 +0400 |
---|---|---|
committer | unknown <hf@deer.mysql.r18.ru> | 2002-12-16 18:58:55 +0400 |
commit | 8db300257b8e457f63a61d27c16ffeb4e23127b1 (patch) | |
tree | 84a5d074a9241cebc5ac2f73a883ad6765c39100 /sql/repl_failsafe.cc | |
parent | fce29f66fb95c1742f3a80c67ad92d21f1cc1544 (diff) | |
parent | 632717fd8d70ff187621df8a0839678ceae19ab5 (diff) | |
download | mariadb-git-8db300257b8e457f63a61d27c16ffeb4e23127b1.tar.gz |
Merging
BitKeeper/etc/logging_ok:
auto-union
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/repl_failsafe.cc')
-rw-r--r-- | sql/repl_failsafe.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 16b2eedd3b2..4942dd9cfd8 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -16,6 +16,8 @@ // Sasha Pachev <sasha@mysql.com> is currently in charge of this file +#ifndef EMBEDDED_LIBRARY + #include "mysql_priv.h" #include "repl_failsafe.h" #include "sql_repl.h" @@ -893,3 +895,6 @@ err: return error; } + +#endif /* EMBEDDED_LIBRARY */ + |