Navigation Menu

Skip to content

Commit

Permalink
Update the patch for MariaDB to work with mroonga on Windows
Browse files Browse the repository at this point in the history
refs #1729

No need to apply patch to MariaDB source except BOM issue.

Here is the related commit.

  ed74a73
  • Loading branch information
kenhys committed Jul 25, 2013
1 parent 4588d72 commit ff11a42
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion packages/source/Makefile.am
Expand Up @@ -101,7 +101,7 @@ files/$(MARIADB_WITH_MROONGA_BASE).tar.gz: tmp/$(MARIADB_WITH_MROONGA_BASE).stam
(cd tmp && tar czf ../$@ $(MARIADB_WITH_MROONGA_BASE))

PATCHES = \
patches/mariadb-10.0.2-windows-build.diff
patches/mariadb-10.0.3-windows-build.diff

tmp/$(MARIADB_WITH_MROONGA_FOR_WINDOWS_BASE).stamp: tmp/$(MARIADB_WITH_MROONGA_BASE).stamp $(PATCHES)
rm -rf tmp/$(MARIADB_WITH_MROONGA_FOR_WINDOWS_BASE)
Expand Down
9 changes: 9 additions & 0 deletions packages/source/patches/mariadb-10.0.3-windows-build.diff
@@ -0,0 +1,9 @@
diff -ur mariadb-10.0.2.orig/sql/sql_locale.cc mariadb-10.0.2/sql/sql_locale.cc
--- mariadb-10.0.2.orig/sql/sql_locale.cc 2013-04-23 13:13:59.000000000 +0900
+++ mariadb-10.0.2/sql/sql_locale.cc 2013-05-19 12:55:27.590366542 +0900
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

0 comments on commit ff11a42

Please sign in to comment.