diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2007-01-26 22:39:58 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2007-01-26 22:39:58 +0000 |
| commit | afcd50037629a9cc60d80f912c060eaa1dcf4e07 (patch) | |
| tree | f838340ae85284e7d5be2a010bb507c379c6dd64 /databases/mysql50-server/files | |
| parent | Upgrade to 2.12-2. (diff) | |
Update to 5.0.33 release.
Diffstat (limited to 'databases/mysql50-server/files')
| -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 |
2 files changed, 11 insertions, 21 deletions
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 */ + |