diff options
| author | monty@narttu.mysql.fi <> | 2003-06-14 11:37:42 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-06-14 11:37:42 +0300 |
| commit | a1034db4b9f55172b75d1dcb5cd11a7d32c716b2 (patch) | |
| tree | f247f6e12388923f7fa5395b19d69e2dc62dbcd1 /sql/client_settings.h | |
| parent | bb8b0d9d760c57df04d0a403237834ac8fa16a35 (diff) | |
| download | mariadb-git-a1034db4b9f55172b75d1dcb5cd11a7d32c716b2.tar.gz | |
Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
Diffstat (limited to 'sql/client_settings.h')
| -rw-r--r-- | sql/client_settings.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sql/client_settings.h b/sql/client_settings.h index 1963281d980..16e11c4eb64 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -17,18 +17,15 @@ #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_rpl_probe(mysql) 0 #undef HAVE_SMEM -#endif +#undef _CUSTOMCONFIG_ |