From 382aba188b6b19f7d015f873d04aad20052d9dea Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Wed, 4 Jun 2003 15:12:32 +0500
Subject: SCRUM simultaneously usable libraries

unification of client structures
---
 include/mysql_com.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/mysql_com.h')

diff --git a/include/mysql_com.h b/include/mysql_com.h
index bbfb869927b..1af1ed36af6 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -125,7 +125,7 @@ typedef struct st_vio Vio;
 #define MAX_BLOB_WIDTH		8192	/* Default width for blob */
 
 typedef struct st_net {
-#ifndef EMBEDDED_LIBRARY
+#if !defined(CHECK_EMBEDDED_DIFFERENCES) || !defined(EMBEDDED_LIBRARY)
   Vio* vio;
   unsigned char *buff,*buff_end,*write_pos,*read_pos;
   my_socket fd;					/* For Perl DBI/dbd */
-- 
cgit v1.2.1


From c4e3a624b87540794a579d3c48ad93bcaab8c634 Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Tue, 17 Jun 2003 21:32:31 +0500
Subject: SCRUM

client capabilities included into libmysqld
some API methods became "virtual"
lots of duplicated code removed

IMHO all the above made library's code way more pleasant to look at, didn't it?
---
 include/mysql_com.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include/mysql_com.h')

diff --git a/include/mysql_com.h b/include/mysql_com.h
index 0624782c075..057045bd5a0 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -232,6 +232,9 @@ void	my_net_local_init(NET *net);
 void	net_end(NET *net);
 void	net_clear(NET *net);
 my_bool net_realloc(NET *net, unsigned long length);
+
+/*HFTODO - should remove it
+ */
 #ifndef EMBEDDED_LIBRARY
 my_bool	net_flush(NET *net);
 #else
-- 
cgit v1.2.1


From 7e1ce534c96063723a0d7459da98efc83bd5ddf5 Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Wed, 18 Jun 2003 15:58:57 +0500
Subject: SCRUM including client code into embedded server code to guess what
 library to use added net_field_length moved to pack.c

---
 include/mysql_com.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/mysql_com.h')

diff --git a/include/mysql_com.h b/include/mysql_com.h
index c480273f3e9..a89569c451e 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -341,6 +341,7 @@ void my_thread_end(void);
 #ifdef _global_h
 ulong STDCALL net_field_length(uchar **packet);
 my_ulonglong net_field_length_ll(uchar **packet);
+char *net_store_length(char *pkg, ulonglong length);
 #endif
 
 #ifdef __cplusplus
-- 
cgit v1.2.1


From c224b55835a01ad38f6b978fe1e23b9363bae1cc Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Fri, 4 Jul 2003 11:40:10 +0500
Subject: SCRUM Including client code into embedded library

Code trimming (fixes of comments etc)
---
 include/mysql_com.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'include/mysql_com.h')

diff --git a/include/mysql_com.h b/include/mysql_com.h
index a89569c451e..ab6330dbe53 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -234,9 +234,7 @@ void	net_end(NET *net);
 void	net_clear(NET *net);
 my_bool net_realloc(NET *net, unsigned long length);
 
-/*HFTODO - should remove it
- */
-#ifndef EMBEDDED_LIBRARY
+#ifndef EMBEDDED_LIBRARY /* To be removed by HF */
 my_bool	net_flush(NET *net);
 #else
 #define net_flush(A)
-- 
cgit v1.2.1