diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql50-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/mysql50-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mysql50-server/files/patch-include__mysql_com.h | 21 | ||||
| -rw-r--r-- | databases/mysql50-server/files/patch-innobase_dict_dict0dict.c | 11 |
4 files changed, 17 insertions, 26 deletions
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index d9cf016269b7..1af6079f8d39 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.27 +PORTVERSION= 5.0.33 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -125,7 +125,8 @@ PLIST_SUB+= NDB="" PLIST_SUB+= NDB="@comment " .endif -MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \ +MAN1= myisamchk.1 myisamlog.1 myisampack.1 \ + my_print_defaults.1 mysql_tzinfo_to_sql.1 \ mysqld_safe.1 mysql.server.1 perror.1 replace.1 INFO= mysql diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index 832dd591578e..de1fe0fd2332 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.0.27.tar.gz) = 584d423440a9d9c859678e3d4f2690b3 -SHA256 (mysql-5.0.27.tar.gz) = 08dc9a7b4adb766b2fb8390804147822f1772aa4bd2e06ca7764bc85010c73a7 -SIZE (mysql-5.0.27.tar.gz) = 25867740 +MD5 (mysql-5.0.33.tar.gz) = 10cb85276a1468c7906a4ff4dd565d61 +SHA256 (mysql-5.0.33.tar.gz) = 20d8b387436f2255c13eaafc1c9e08c15b9ef64d411d4b04f05c3cdc01772da2 +SIZE (mysql-5.0.33.tar.gz) = 23045481 diff --git a/databases/mysql50-server/files/patch-include__mysql_com.h b/databases/mysql50-server/files/patch-include__mysql_com.h deleted file mode 100644 index 7ecc1d7e45ee..000000000000 --- a/databases/mysql50-server/files/patch-include__mysql_com.h +++ /dev/null @@ -1,21 +0,0 @@ -# -# Apply fix for MySQL bug http://bugs.mysql.com/bug.php?id=22227 -# ---- include/mysql_com.h.orig Fri Aug 25 18:11:46 2006 -+++ include/mysql_com.h Wed Sep 27 10:02:44 2006 -@@ -134,11 +134,11 @@ - #define CLIENT_TRANSACTIONS 8192 /* Client knows about transactions */ - #define CLIENT_RESERVED 16384 /* Old flag for 4.1 protocol */ - #define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */ --#define CLIENT_MULTI_STATEMENTS (((ulong) 1) << 16) /* Enable/disable multi-stmt support */ --#define CLIENT_MULTI_RESULTS (((ulong) 1) << 17) /* Enable/disable multi-results */ -+#define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */ -+#define CLIENT_MULTI_RESULTS (1UL << 17) /* Enable/disable multi-results */ - --#define CLIENT_SSL_VERIFY_SERVER_CERT (((ulong) 1) << 30) --#define CLIENT_REMEMBER_OPTIONS (((ulong) 1) << 31) -+#define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30) -+#define CLIENT_REMEMBER_OPTIONS (1UL << 31) - - #define SERVER_STATUS_IN_TRANS 1 /* Transaction has started */ - #define SERVER_STATUS_AUTOCOMMIT 2 /* Server in auto_commit mode */ diff --git a/databases/mysql50-server/files/patch-innobase_dict_dict0dict.c b/databases/mysql50-server/files/patch-innobase_dict_dict0dict.c new file mode 100644 index 000000000000..e72e16c708c9 --- /dev/null +++ b/databases/mysql50-server/files/patch-innobase_dict_dict0dict.c @@ -0,0 +1,11 @@ +--- innobase/dict/dict0dict.c.orig Fri Jan 26 22:17:57 2007 ++++ innobase/dict/dict0dict.c Fri Jan 26 22:20:11 2007 +@@ -28,7 +28,7 @@ + #include "rem0cmp.h" + + /* Implement isspace() in a locale-independent way. (Bug #24299) */ +-#define ib_isspace(c) strchr(" \v\f\t\r\n", c) ++#define ib_isspace(c) (strchr(" \v\f\t\r\n", c) && c != '\0') + + dict_sys_t* dict_sys = NULL; /* the dictionary system */ + |