diff options
| author | unknown <hf@deer.(none)> | 2003-06-03 15:02:57 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-03 15:02:57 +0500 |
| commit | aed6de39b6129d84f091e23b4a8b0f5cc8e6076d (patch) | |
| tree | 52e689b118c79c0b3706dafc28ecf72060fa9844 /sql/client_settings.h | |
| parent | 62c7d2cd2711d3ab2b7d0adba2947b38168cc4b3 (diff) | |
| download | mariadb-git-aed6de39b6129d84f091e23b4a8b0f5cc8e6076d.tar.gz | |
SCRUM:
splittiln common client's parts
include/sql_common.h:
superfluous #ifdef-s removed
libmysql/client_settings.h:
superfluous #ifdef-s removed
libmysql/libmysql.c:
some litter removed
libmysqld/lib_sql.cc:
here we had wrong parameters
mysys/default.c:
this is not needed anymore - calling code fixed
sql-common/client.c:
code trimmed and simplified
sql/client_settings.h:
code trimmed
sql/repl_failsafe.cc:
option's initialization added
sql/slave.cc:
option's initialization added
Diffstat (limited to 'sql/client_settings.h')
| -rw-r--r-- | sql/client_settings.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/client_settings.h b/sql/client_settings.h index de0c7f40717..bc4cdf2a777 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -15,19 +15,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _client_settings_h -#define _client_settings_h #include <thr_alarm.h> -#include <mysql_embed.h> -#include <mysql_com.h> +extern char *mysql_unix_port; -#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | \ - CLIENT_LOCAL_FILES | CLIENT_SECURE_CONNECTION) +#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG \ + | CLIENT_LOCAL_FILES | CLIENT_SECURE_CONNECTION) extern ulong slave_net_timeout; #define init_sigpipe_variables #define set_sigpipe(mysql) #define reset_sigpipe(mysql) -#endif /* _client_settings_h */ + +#ifdef HAVE_SMEM +#undef HAVE_SMEM +#endif |