- Update to 1.0.14

Thanks to Andrej Zverev (az[at]inec[dot]ru) for help.

6 files changed, 45 insertions, 57 deletions

diff --git a/databases/mysql-administrator/files/patch-Makefile.am b/databases/mysql-administrator/files/patch-Makefile.am
new file mode 100644
index 000000000000..f77feee3d83f
--- /dev/null
+++ b/databases/mysql-administrator/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- mysql-gui-common/library/source/Makefile.am.orig	Wed Nov  3 01:28:52 2004
++++ mysql-gui-common/library/source/Makefile.am	Sat Nov  6 17:35:25 2004
+@@ -5,7 +5,7 @@
+ 
+ INCLUDES= -Wall -Wsign-compare\
+ 	 -I../include -I../shared_include -I../public_interface/linux\
+-	@MYSQL_INCLUDE@ @GLIB_CFLAGS@ @PCRE_CFLAGS@
++	@MYSQL_INCLUDE@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ -D__USE_POSIX
+ 
+ test_SOURCES=test.c
+ 
diff --git a/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::Makefile.am b/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::Makefile.am
deleted file mode 100644
index 8313d30cb6e5..000000000000
--- a/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-gui-common/library/source/Makefile.am.orig	Thu Apr  1 00:34:03 2004
-+++ mysql-gui-common/library/source/Makefile.am	Thu Apr  1 00:33:32 2004
-@@ -2,7 +2,7 @@
- noinst_LIBRARIES = libmysqlx.a
- 
- INCLUDES= -I../include -I../public_interface/linux\
--	@MYSQL_INCLUDE@ @GLIB_CFLAGS@
-+	@MYSQL_INCLUDE@ @GLIB_CFLAGS@ -D__USE_POSIX
- 
- 
- libmysqlx_a_SOURCES=\
diff --git a/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::myx_library.c b/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::myx_library.c
deleted file mode 100644
index 0395367d64b0..000000000000
--- a/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::myx_library.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- mysql-gui-common/library/source/myx_library.c.orig	Sat Mar 20 21:58:39 2004
-+++ mysql-gui-common/library/source/myx_library.c	Sat Mar 20 22:12:51 2004
-@@ -35,6 +35,7 @@
- #endif
- typedef long long longlong;
- typedef unsigned long long ulonglong;
-+typedef int	pchar;
- #else
- typedef unsigned int           uint;   
- typedef unsigned char           uint8;
-@@ -306,7 +307,7 @@
-   machine_info->IP= malloc(sizeof(char)*16);
-   machine_info->OS= malloc(sizeof(char)*16);
-   machine_info->hardware= malloc(sizeof(char)*200);
--
-+/*
-   if(mysql->options.protocol==MYSQL_PROTOCOL_MEMORY)
-   {
-     add_host_info= strdup("via shared memory");
-@@ -320,14 +321,14 @@
-     add_host_info= strdup("via named pipe");  
-   }
-   else if(mysql->options.protocol==MYSQL_PROTOCOL_TCP)
--  {
-+  {*/
-     add_host_info= strdup("via TCP/IP");
--  }
-+/*  }
-   else
-   {
-     add_host_info= strdup("");
-   }
--
-+*/
-   sprintf(machine_info->version, "MySQL %s %s", (unsigned char *)mysql_get_server_info(mysql), add_host_info);
- 
-   free(add_host_info);
-@@ -482,7 +483,7 @@
- 
- const char * myx_get_server_charset_name(MYSQL *mysql)
- {
--  return mysql->charset->csname;
-+  return mysql->charset->name;
- }
- 
- 
diff --git a/databases/mysql-administrator/files/patch-myx_aux_functions.h b/databases/mysql-administrator/files/patch-myx_aux_functions.h
new file mode 100644
index 000000000000..9ab752c40fbd
--- /dev/null
+++ b/databases/mysql-administrator/files/patch-myx_aux_functions.h
@@ -0,0 +1,10 @@
+--- mysql-gui-common/library/include/myx_aux_functions.h.orig	Sat Nov  6 20:07:35 2004
++++ mysql-gui-common/library/include/myx_aux_functions.h	Sat Nov  6 20:08:03 2004
+@@ -18,6 +18,7 @@
+ #define myx_aux_functions_h
+ 
+ #include <sys/types.h>
++#include <sys/time.h>
+ #include <string.h>
+ #include <errno.h>
+ 
diff --git a/databases/mysql-administrator/files/patch-myx_grt_private.c b/databases/mysql-administrator/files/patch-myx_grt_private.c
new file mode 100644
index 000000000000..cbe7faeb64f0
--- /dev/null
+++ b/databases/mysql-administrator/files/patch-myx_grt_private.c
@@ -0,0 +1,14 @@
+--- mysql-gui-common/library_grt/source/myx_grt_private.c.orig	Sat Nov  6 20:21:40 2004
++++ mysql-gui-common/library_grt/source/myx_grt_private.c	Sat Nov  6 20:22:02 2004
+@@ -47,8 +47,10 @@
+ int myx_grt_printf(MYX_GRT *grt, const char *fmt, ...)
+ {
+   va_list args;
++  char *tmp;
++
+   va_start(args, fmt);
+-  char *tmp= g_strdup_vprintf(fmt, args);
++  tmp= g_strdup_vprintf(fmt, args);
+   va_end(args);
+   
+   MYX_PRINT(grt, tmp);
diff --git a/databases/mysql-administrator/files/patch-myx_ser_aux_functions.c b/databases/mysql-administrator/files/patch-myx_ser_aux_functions.c
new file mode 100644
index 000000000000..d8df6b806e33
--- /dev/null
+++ b/databases/mysql-administrator/files/patch-myx_ser_aux_functions.c
@@ -0,0 +1,10 @@
+--- mysql-gui-common/library/source/myx_ser_aux_functions.c.orig	Sat Aug 28 00:20:08 2004
++++ mysql-gui-common/library/source/myx_ser_aux_functions.c	Sat Aug 28 00:20:31 2004
+@@ -18,6 +18,7 @@
+ #include <glib.h>
+ #include <string.h>
+ #include <stdio.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ 
+ struct _MYX_SFD