summaryrefslogtreecommitdiff
path: root/databases/mysql4-client/patches
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql4-client/patches')
-rw-r--r--databases/mysql4-client/patches/patch-ax4
-rw-r--r--databases/mysql4-client/patches/patch-bd21
2 files changed, 12 insertions, 13 deletions
diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax
index 7aa5716315b..2654ee5d306 100644
--- a/databases/mysql4-client/patches/patch-ax
+++ b/databases/mysql4-client/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.4 2005/09/26 22:34:49 xtraeme Exp $
+$NetBSD: patch-ax,v 1.4.6.1 2006/09/13 13:35:59 salo Exp $
--- scripts/Makefile.in.orig 2005-09-26 23:51:54.000000000 +0200
+++ scripts/Makefile.in 2005-09-26 23:52:22.000000000 +0200
@@ -26,7 +26,7 @@ $NetBSD: patch-ax,v 1.4 2005/09/26 22:34:49 xtraeme Exp $
+bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
+ mysql_setpermission mysql_zap mysqlaccess mysqlbug \
+ mysql_convert_table_format mysql_find_rows mysqlhotcopy \
-+ mysqldumpslow mysql_explain_log mysql_tableinfo \
++ mysql_explain_log mysql_tableinfo \
mysql_create_system_tables
noinst_SCRIPTS = make_binary_distribution \
diff --git a/databases/mysql4-client/patches/patch-bd b/databases/mysql4-client/patches/patch-bd
index e93414ae717..f467b9b3bf8 100644
--- a/databases/mysql4-client/patches/patch-bd
+++ b/databases/mysql4-client/patches/patch-bd
@@ -1,6 +1,6 @@
-$NetBSD: patch-bd,v 1.1 2006/06/19 07:53:00 seb Exp $
+$NetBSD: patch-bd,v 1.1.2.1 2006/09/13 13:35:59 salo Exp $
---- tests/mysql_client_test.c.orig 2006-05-24 18:00:37.000000000 +0000
+--- tests/mysql_client_test.c.orig 2006-07-19 15:10:41.000000000 +0000
+++ tests/mysql_client_test.c
@@ -22,6 +22,7 @@
***************************************************************************/
@@ -10,12 +10,13 @@ $NetBSD: patch-bd,v 1.1 2006/06/19 07:53:00 seb Exp $
#include <my_sys.h>
#include <mysql.h>
#include <errmsg.h>
-@@ -11745,6 +11746,49 @@ static void test_bug12744()
+@@ -11855,6 +11856,48 @@ static void test_bug15613()
+ mysql_stmt_close(stmt);
}
- /*
++/*
+ Bug #17667: An attacker has the opportunity to bypass query logging.
-+*/
++ */
+
+static void test_bug17667()
+{
@@ -55,16 +56,14 @@ $NetBSD: patch-bd,v 1.1 2006/06/19 07:53:00 seb Exp $
+ myquery(rc);
+}
+
-+
-+/*
- Bug#11718: query with function, join and order by returns wrong type
- */
-@@ -12078,6 +12122,7 @@ static struct my_tests_st my_tests[]= {
+ /*
+ Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
+@@ -12130,6 +12173,7 @@ static struct my_tests_st my_tests[]= {
{ "test_bug11718", test_bug11718 },
{ "test_bug12925", test_bug12925 },
{ "test_bug15613", test_bug15613 },
+ { "test_bug17667", test_bug17667 },
+ { "test_bug20152", test_bug20152 },
{ 0, 0 }
};
-