summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2011-06-07 00:06:41 +0000
committerDoug Barton <dougb@FreeBSD.org>2011-06-07 00:06:41 +0000
commit2519ee2c5e8365bf5fe20ce485a94bccf7eb2f5a (patch)
tree9f8d924e9ac3fef3fd1a7e89decee56c77da7d1d
parentDescribe how CPPFLAGS is now passed to both the configure and make (diff)
Remove patches no longer relevant to 5.2.6 after they were
incorporated upstream
Notes
Notes: svn path=/head/; revision=275165
-rw-r--r--databases/mariadb-server/files/patch-extra::yassl::src::yassl_error.cpp11
-rw-r--r--databases/mariadb-server/files/patch-sql::mysqld.cc12
2 files changed, 0 insertions, 23 deletions
diff --git a/databases/mariadb-server/files/patch-extra::yassl::src::yassl_error.cpp b/databases/mariadb-server/files/patch-extra::yassl::src::yassl_error.cpp
deleted file mode 100644
index 27c39649dce6..000000000000
--- a/databases/mariadb-server/files/patch-extra::yassl::src::yassl_error.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- extra/yassl/src/yassl_error.cpp.orig 2011-03-01 22:22:55.000000000 -0800
-+++ extra/yassl/src/yassl_error.cpp 2011-05-31 16:50:56.000000000 -0700
-@@ -128,7 +128,7 @@
- break;
-
- case badVersion_error :
-- strncpy(buffer, "protocl version mismatch", max);
-+ strncpy(buffer, "protocol version mismatch", max);
- break;
-
- case compress_error :
diff --git a/databases/mariadb-server/files/patch-sql::mysqld.cc b/databases/mariadb-server/files/patch-sql::mysqld.cc
deleted file mode 100644
index 91fdb26d2169..000000000000
--- a/databases/mariadb-server/files/patch-sql::mysqld.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- sql/mysqld.cc.orig 2011-03-01 22:24:07.000000000 -0800
-+++ sql/mysqld.cc 2011-05-31 16:50:56.000000000 -0700
-@@ -744,9 +744,7 @@
- /* Static variables */
-
- static bool kill_in_progress, segfaulted;
--#ifdef HAVE_STACKTRACE
- static my_bool opt_stack_trace;
--#endif /* HAVE_STACKTRACE */
- static my_bool opt_bootstrap, opt_myisam_log;
- static int cleanup_done;
- static ulong opt_specialflag, opt_myisam_block_size;