MDEV-5319 - Request for merge of Oqgraph v3 functionality

            storage/oqgraph into 10.0

- since oqgraph depends on Judy, move it to a separate package (DEB)

5 files changed, 17 insertions, 2 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index bb1d831ca21..236e5540c0d 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -250,3 +250,11 @@ Description: Connect storage engine for MariaDB
  connections to ODBC tables and remote MySQL tables, as well as a number of
  other interesting features.
 
+Package: mariadb-oqgraph-engine-10.0
+Section: database
+Architecture: any
+Depends: mariadb-server-10.0, libjudydebian1
+Description: Oqgraph storage engine for MariaDB
+ The OQGRAPH engine is a computation engine plugin for handling hierarchies
+ (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
+
diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/dist/Debian/mariadb-server-10.0.files.in
index f5501734d49..80db03bd695 100644
--- a/debian/dist/Debian/mariadb-server-10.0.files.in
+++ b/debian/dist/Debian/mariadb-server-10.0.files.in
@@ -76,6 +76,5 @@ usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
 @CASSANDRA_DEB_FILES@
-@OQGRAPH_DEB_FILES@
 @SPIDER_DEB_FILES@
 @TOKUDB_DEB_FILES@
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index cf9c0e086fc..410e992429c 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -244,3 +244,11 @@ Description: Connect storage engine for MariaDB
  connections to ODBC tables and remote MySQL tables, as well as a number of
  other interesting features.
 
+Package: mariadb-oqgraph-engine-10.0
+Section: database
+Architecture: any
+Depends: mariadb-server-10.0, libjudydebian1
+Description: Oqgraph storage engine for MariaDB
+ The OQGRAPH engine is a computation engine plugin for handling hierarchies
+ (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
+
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-server-10.0.files.in
index 2bdd91bc564..9c554884e88 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in
+++ b/debian/dist/Ubuntu/mariadb-server-10.0.files.in
@@ -78,6 +78,5 @@ usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
 @CASSANDRA_DEB_FILES@
-@OQGRAPH_DEB_FILES@
 @SPIDER_DEB_FILES@
 @TOKUDB_DEB_FILES@
diff --git a/debian/mariadb-oqgraph-engine-10.0.files b/debian/mariadb-oqgraph-engine-10.0.files
new file mode 100644
index 00000000000..f67b0cd9d13
--- /dev/null
+++ b/debian/mariadb-oqgraph-engine-10.0.files
@@ -0,0 +1 @@
+usr/lib/mysql/plugin/ha_oqgraph.so