Update to 10.0.15.

 - InnoDB is now disabled by default.  MariaDB ships with
   XtraDB as drop-in replacement of InnoDB but keeps the
   original InnoDB as an option you have to set specifically
   to enable it.
 - Added support for Mroonga storage engine.
 - Removed mytop script, which the latest version can be
   installed via databases/mytop.
 - Moved INNODB option to the Server part (as OQGraph)
 - Updated -server log only as this only affects -server.

Submitted by:	Bernard Spil <spil oss gmail com> (maintainer)

4 files changed, 4 insertions, 58 deletions

diff --git a/databases/mariadb100-server/files/patch-storage_connect_array.cpp b/databases/mariadb100-server/files/patch-storage_connect_array.cpp
deleted file mode 100644
index 3968f4ff377e..000000000000
--- a/databases/mariadb100-server/files/patch-storage_connect_array.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/connect/array.cpp.orig	2014-09-25 00:29:47.000000000 +0200
-+++ storage/connect/array.cpp	2014-09-27 12:00:33.000000000 +0200
-@@ -129,7 +129,7 @@
-         break;
-       case TYPE_VOID:
-         // Integer stored inside pp->Value
--        par->AddValue(g, (int)parmp->Value);
-+        par->AddValue(g, *(int*)parmp->Value);
-         break;
-       } // endswitch valtyp
- 
diff --git a/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp b/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp
deleted file mode 100644
index 3a082bc01d90..000000000000
--- a/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- storage/connect/filamap.cpp.orig	2014-09-25 00:29:47.000000000 +0200
-+++ storage/connect/filamap.cpp	2014-09-27 11:46:06.000000000 +0200
-@@ -288,7 +288,7 @@
- /***********************************************************************/
- /*  Initialize Fpos and Mempos for indexed DELETE.                     */
- /***********************************************************************/
--int MAPFAM::InitDelete(PGLOBAL g, int fpos, int spos)
-+int MAPFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos)
-   {
-   Fpos = Memory + fpos;
-   Mempos = Memory + spos;
-@@ -683,7 +683,7 @@
- /***********************************************************************/
- /*  Initialize CurBlk, CurNum, Mempos and Fpos for indexed DELETE.     */
- /***********************************************************************/
--int MPXFAM::InitDelete(PGLOBAL g, int fpos, int spos)
-+int MPXFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos)
-   {
-   Fpos = Memory + Headlen + fpos * Lrecl;
-   Mempos = Fpos + Lrecl;
diff --git a/databases/mariadb100-server/files/patch-storage_connect_filamap.h b/databases/mariadb100-server/files/patch-storage_connect_filamap.h
deleted file mode 100644
index a3cca7da1a5d..000000000000
--- a/databases/mariadb100-server/files/patch-storage_connect_filamap.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- storage/connect/filamap.h.orig	2014-09-25 00:29:47.000000000 +0200
-+++ storage/connect/filamap.h	2014-09-27 11:44:39.000000000 +0200
-@@ -47,7 +47,7 @@
-   virtual void  Rewind(void);
- 
-  protected:
--  virtual int   InitDelete(PGLOBAL g, int fpos, int spos);
-+  virtual int   InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos);
- 
-   // Members
-   char *Memory;               // Pointer on file mapping view.
-@@ -104,13 +104,13 @@
-   virtual int   MaxBlkSize(PGLOBAL g, int s)
-                 {return TXTFAM::MaxBlkSize(g, s);}
-   virtual bool  SetPos(PGLOBAL g, int recpos);
--  virtual int   GetNextPos(void) {return (int)Fpos + Nrec;}
-+  virtual int   GetNextPos(void) {return (uintptr_t)Fpos + Nrec;}
-   virtual bool  DeferReading(void) {return false;}
-   virtual int   ReadBuffer(PGLOBAL g);
-   virtual int   WriteBuffer(PGLOBAL g);
- 
-  protected:
--  virtual int   InitDelete(PGLOBAL g, int fpos, int spos);
-+  virtual int   InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos);
- 
-   // No additional members
-   }; // end of class MPXFAM
diff --git a/databases/mariadb100-server/files/pkg-message.in b/databases/mariadb100-server/files/pkg-message.in
index 060c6c66c17f..b49d42074149 100644
--- a/databases/mariadb100-server/files/pkg-message.in
+++ b/databases/mariadb100-server/files/pkg-message.in
@@ -8,4 +8,8 @@ MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
 my.cnf. Please move existing my.cnf files from those paths to
 %%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
 
+This port does NOT include the mytop perl script, this is included in
+the MariaDB tarball but the most recent version can be found in the
+databases/mytop port
+
 ************************************************************************