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 | 77892ac27ae289541d3561eb12dccefa0cdf7931 (patch) | |
| tree | 84a5d074a9241cebc5ac2f73a883ad6765c39100 /sql/repl_failsafe.cc | |
| parent | 8745c29b08a2a82edc5a86b2d25dd30daaa2de5a (diff) | |
| parent | a42aa8db7f1b7f4399f6eb5c5be97a2f6918f9bc (diff) | |
| download | mariadb-git-77892ac27ae289541d3561eb12dccefa0cdf7931.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 */ + |