diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2003-01-15 12:11:44 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2003-01-15 12:11:44 +0400 |
| commit | 09b79b65f225e7e7f66077f95b00e095cf454c3a (patch) | |
| tree | 5a4ad419f88f794ce2bdff28466653d3de9f4156 /sql/repl_failsafe.cc | |
| parent | 1bc932384b2043a326f2ce71a4e71ac2aba47580 (diff) | |
| download | mariadb-git-09b79b65f225e7e7f66077f95b00e095cf454c3a.tar.gz | |
SCRUM
embedded library trimming
include/my_global.h:
HAVE_REPLICATION & HAVE_EXTERNAL_CLIENT macro definitions
libmysqld/lib_sql.cc:
Protocol:: methods implementation for embedded case
sql/field.cc:
geometry type methods implementations
sql/ha_berkeley.cc:
set_nfields deletion
sql/ha_innodb.cc:
macro changed
sql/ha_myisam.cc:
set_nfields deletion
sql/ha_myisam.h:
code #ifdef-ed
sql/item.cc:
bugfix
sql/item_func.cc:
macro changed
sql/item_strfunc.cc:
superfluous code deleted
sql/log.cc:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/log_event.cc:
#ifdef constructions changed
sql/log_event.h:
#ifdef-s changed
sql/mf_iocache.cc:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/mini_client.cc:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/mysql_priv.h:
code removation
sql/mysqld.cc:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/opt_range.cc:
code trimming
sql/protocol.cc:
net_store_data becomes a member of Protocol
sql/protocol.h:
changes to make Protocol working in embedded library
sql/repl_failsafe.cc:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/repl_failsafe.h:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/set_var.cc:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/slave.cc:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/slave.h:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_parse.cc:
code trimming
sql/sql_prepare.cc:
comment added
sql/sql_repl.cc:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_repl.h:
HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_show.cc:
mysql_list_processes to work in embedded library
sql/sql_table.cc:
set_nfields deletion
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 4942dd9cfd8..6ef252467c3 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -16,9 +16,9 @@ // Sasha Pachev <sasha@mysql.com> is currently in charge of this file -#ifndef EMBEDDED_LIBRARY - #include "mysql_priv.h" +#ifdef HAVE_REPLICATION + #include "repl_failsafe.h" #include "sql_repl.h" #include "slave.h" @@ -896,5 +896,5 @@ err: return error; } -#endif /* EMBEDDED_LIBRARY */ +#endif /* HAVE_REPLICATION */ |