Some mistakes fixed

libmysql/libmysql.c:
  was removed by mistake during merging
libmysqld/Makefile.am:
  link should be removed first
libmysqld/libmysqld.c:
  We don't need this line here
sql-common/pack.c:
  Function was moved to old place
sql/sql_client.cc:
  we do need this function

5 files changed, 21 insertions, 21 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 39cff002e45..d3dc5af0f9c 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -60,6 +60,12 @@
 #include <sql_common.h>
 #include "client_settings.h"
 
+ulong 		net_buffer_length=8192;
+ulong		max_allowed_packet= 1024L*1024L*1024L;
+ulong		net_read_timeout=  NET_READ_TIMEOUT;
+ulong		net_write_timeout= NET_WRITE_TIMEOUT;
+
+
 #ifdef EMBEDDED_LIBRARY
 #undef net_flush
 my_bool	net_flush(NET *net);
@@ -150,6 +156,7 @@ void STDCALL mysql_server_end()
   else
     mysql_thread_end();
 }
+
 #endif /*EMBEDDED_LIBRARY*/
 
 my_bool STDCALL mysql_thread_init()
@@ -1226,6 +1233,19 @@ uint STDCALL mysql_thread_safe(void)
 ****************************************************************************/
 
 /*
+  Functions called my my_net_init() to set some application specific variables
+*/
+
+void my_net_local_init(NET *net)
+{
+  net->max_packet=   (uint) net_buffer_length;
+  net->read_timeout= (uint) net_read_timeout;
+  net->write_timeout=(uint) net_write_timeout;
+  net->retry_count=  1;
+  net->max_packet_size= max(net_buffer_length, max_allowed_packet);
+}
+
+/*
   Add escape characters to a string (blob?) to make it suitable for a insert
   to should at least have place for length*2+1 chars
   Returns the length of the to string
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index d87bf3c9b52..e61e7833451 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -115,6 +115,7 @@ link_sources:
 	    rm -f $(srcdir)/$$f; \
 	    @LN_CP_F@ $(srcdir)/../libmysql/$$f $(srcdir)/$$f; \
 	  done; \
+	  rm -f $(srcdir)/client_settings.h; \
 	  @LN_CP_F@ $(srcdir)/../libmysql/client_settings.h $(srcdir)/client_settings.h;
 
 
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index 16be7d884fa..0a096a88889 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -46,7 +46,6 @@
 #define INADDR_NONE	-1
 #endif
 
-const char	*not_error_sqlstate= "00000";
 #define CLIENT_CAPABILITIES	(CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | CLIENT_PROTOCOL_41)
 
 #if defined(MSDOS) || defined(__WIN__)
diff --git a/sql-common/pack.c b/sql-common/pack.c
index 43e0098bf29..e31e596ae7a 100644
--- a/sql-common/pack.c
+++ b/sql-common/pack.c
@@ -18,11 +18,6 @@
 #include <mysql_com.h>
 #include <mysql.h>
 
-ulong 		net_buffer_length=8192;
-ulong		max_allowed_packet= 1024L*1024L*1024L;
-ulong		net_read_timeout=  NET_READ_TIMEOUT;
-ulong		net_write_timeout= NET_WRITE_TIMEOUT;
-
 /* Get the length of next field. Change parameter to point at fieldstart */
 ulong STDCALL net_field_length(uchar **packet)
 {
@@ -83,19 +78,6 @@ my_ulonglong net_field_length_ll(uchar **packet)
 #endif
 }
 
-/*
-  Functions called my my_net_init() to set some application specific variables
-*/
-
-void my_net_local_init(NET *net)
-{
-  net->max_packet=   (uint) net_buffer_length;
-  net->read_timeout= (uint) net_read_timeout;
-  net->write_timeout=(uint) net_write_timeout;
-  net->retry_count=  1;
-  net->max_packet_size= max(net_buffer_length, max_allowed_packet);
-}
-
 char *
 net_store_length(char *pkg, ulonglong length)
 {
diff --git a/sql/sql_client.cc b/sql/sql_client.cc
index 4b0f3f930f3..1ae9a23a924 100644
--- a/sql/sql_client.cc
+++ b/sql/sql_client.cc
@@ -20,7 +20,6 @@
 
 #include "mysql_priv.h"
 
-#ifdef CLEAN_DUP
 /*
   Function called by my_net_init() to set some check variables
 */
@@ -38,7 +37,6 @@ void my_net_local_init(NET *net)
 #endif
 }
 }
-#endif /*CLEAN_DUP*/
 
 extern "C" {
 void mysql_once_init(void)