From a1034db4b9f55172b75d1dcb5cd11a7d32c716b2 Mon Sep 17 00:00:00 2001
From: "monty@narttu.mysql.fi" <>
Date: Sat, 14 Jun 2003 11:37:42 +0300
Subject: 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

---
 sql/client_settings.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'sql/client_settings.h')

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_
-- 
cgit v1.2.1


From c1f1107b2ad02adf50671628681fb916ac4d98f3 Mon Sep 17 00:00:00 2001
From: "monty@narttu.mysql.fi" <>
Date: Mon, 16 Jun 2003 01:13:24 +0300
Subject: Add missing defines

---
 sql/client_settings.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sql/client_settings.h')

diff --git a/sql/client_settings.h b/sql/client_settings.h
index 16e11c4eb64..efae3f18a8b 100644
--- a/sql/client_settings.h
+++ b/sql/client_settings.h
@@ -26,6 +26,8 @@
 #define reset_sigpipe(mysql)
 #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
 #undef _CUSTOMCONFIG_
-- 
cgit v1.2.1