diff options
| author | unknown <hf@deer.(none)> | 2003-06-17 21:53:13 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-17 21:53:13 +0500 |
| commit | 46cb15ccd477007c8ba2abaa90f86960a8adc7bd (patch) | |
| tree | 8bec4511106588d39e833346b08272d3d00f72ee /sql/client_settings.h | |
| parent | ef726bbff367ab6c5aa735655d8ff6c3fdccdb7d (diff) | |
| parent | a4792eefad19e4f70471952afedef2221fbfbd64 (diff) | |
| download | mariadb-git-46cb15ccd477007c8ba2abaa90f86960a8adc7bd.tar.gz | |
SCRUM
merged conflicts about my previous commit
it seems there are some errors left - gonna check...
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
include/mysql_com.h:
Auto merged
include/sql_common.h:
Auto merged
include/mysql.h:
conflicts merged
libmysql/client_settings.h:
conflicts merged
libmysql/libmysql.c:
conflicts merged
sql-common/client.c:
conflicts merged
sql/client_settings.h:
conflicts merged
sql/protocol.cc:
conflict merged
Diffstat (limited to 'sql/client_settings.h')
| -rw-r--r-- | sql/client_settings.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sql/client_settings.h b/sql/client_settings.h index 206f00ba3fe..5a16fdd1c2f 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -17,20 +17,19 @@ #include <thr_alarm.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_SECURE_CONNECTION | CLIENT_TRANSACTIONS | \ + CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION) #define init_sigpipe_variables #define set_sigpipe(mysql) #define reset_sigpipe(mysql) - -extern ulong slave_net_timeout; - -#ifdef HAVE_SMEM +#define read_user_name(A) {} +#define mysql_rpl_query_type(A,B) MYSQL_RPL_ADMIN +#define mysql_master_send_query(A, B, C) 1 +#define mysql_slave_send_query(A, B, C) 1 +#define mysql_rpl_probe(mysql) 0 #undef HAVE_SMEM -#endif - #define CLI_MYSQL_USE_RESULT NULL +#undef _CUSTOMCONFIG_ + |