mariadb 10.1.15
Closes #2574. Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
This commit is contained in:
parent
38a9721793
commit
1fb94a082f
1 changed files with 20 additions and 2 deletions
|
@ -1,8 +1,8 @@
|
|||
class Mariadb < Formula
|
||||
desc "Drop-in replacement for MySQL"
|
||||
homepage "https://mariadb.org/"
|
||||
url "http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.14/source/mariadb-10.1.14.tar.gz"
|
||||
sha256 "18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13"
|
||||
url "http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.15/source/mariadb-10.1.15.tar.gz"
|
||||
sha256 "7cc0e55eec64e9ef48345288abe67cf36e72dd2da30d52e4726332ad2a5fea0f"
|
||||
|
||||
bottle do
|
||||
sha256 "7d1ec840153e4921f2db498afba1809aa117ea51ca154fc43b384704f88fb773" => :el_capitan
|
||||
|
@ -10,6 +10,10 @@ class Mariadb < Formula
|
|||
sha256 "fa09ca1ec1a6557099eafe2b0955a78ec4841a795194400b321914f84aab99fe" => :mavericks
|
||||
end
|
||||
|
||||
# upstream fix for compilation error, marked fixed for 10.1.16
|
||||
# https://jira.mariadb.org/browse/MDEV-10322
|
||||
patch :DATA
|
||||
|
||||
option :universal
|
||||
option "with-test", "Keep test when installing"
|
||||
option "with-bench", "Keep benchmark app when installing"
|
||||
|
@ -199,3 +203,17 @@ class Mariadb < Formula
|
|||
end
|
||||
end
|
||||
end
|
||||
__END__
|
||||
diff --git a/storage/connect/jdbconn.cpp b/storage/connect/jdbconn.cpp
|
||||
index 9b47927..7c0582d 100644
|
||||
--- a/storage/connect/jdbconn.cpp
|
||||
+++ b/storage/connect/jdbconn.cpp
|
||||
@@ -270,7 +270,7 @@ PQRYRES JDBCColumns(PGLOBAL g, char *db, char *table, char *colpat,
|
||||
return NULL;
|
||||
|
||||
// Colpat cannot be null or empty for some drivers
|
||||
- cap->Pat = (colpat && *colpat) ? colpat : "%";
|
||||
+ cap->Pat = (colpat && *colpat) ? colpat : PlugDup(g, "%");
|
||||
|
||||
/************************************************************************/
|
||||
/* Now get the results into blocks. */
|
||||
|
|
Loading…
Reference in a new issue