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/mini_client.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/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index b84f01da16c..d32154685f0 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -22,8 +22,9 @@ in case we decide to make them external at some point */ -#ifndef EMBEDDED_LIBRARY #include <my_global.h> +#ifdef HAVE_EXTERNAL_CLIENT + /* my_pthread must be included early to be able to fix things */ #if defined(THREAD) #include <my_pthread.h> /* because of signal() */ @@ -1473,4 +1474,4 @@ MYSQL_RES *mc_mysql_store_result(MYSQL *mysql) DBUG_RETURN(result); /* Data fetched */ } -#endif /*EMBEDDED_LIBRARY*/ +#endif /* HAVE_EXTERNAL_CLIENT */ |