From 03e49d15eb331fc0983becdaf9dc81f50dfc6a00 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 17 Mar 2008 16:38:18 +0000
Subject: [PATCH] MARIA: FULLTEXT, reserved word

---
 ChangeLog                    | 1 +
 libraries/sqlparser.data.php | 6 ++++--
 tbl_structure.php            | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed9fb1854..91b4d031f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@ danbarry
    * minimal support on db structure page
    * export
 + [pdf] Merged tcpdf 2.2.002 (PHP5 version), thanks to Nicola Asuni 
++ [engines] Maria (work in progress) 
 
 2.11.6.0 (not yet released)
 - bug #1903724 [interface] Displaying of very large queries in error message
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index a111d4024..5e226a752 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -363,6 +363,7 @@ $PMA_SQPdata_column_attrib = array (
     'INNOBASE',         // Engine alias InnoDB
     'INNODB',           // Engine InnoDB
     'ISAM',             // Engine
+    'MARIA',            // Engine
     'MEMORY',           // Engine alias HEAP, but preferred
     'MERGE',            // Engine
     'MRG_ISAM',         // Engine
@@ -383,7 +384,7 @@ $PMA_SQPdata_column_attrib = array (
  *
  * @global integer MySQL attributes count
  */
-$PMA_SQPdata_column_attrib_cnt = 29;
+$PMA_SQPdata_column_attrib_cnt = 30;
 
 /**
  * words that are reserved by MySQL and may not be used as identifiers without quotes
@@ -529,6 +530,7 @@ $PMA_SQPdata_reserved_word = array (
     'LOCKS',
     'LOGS',
     'LOW_PRIORITY',
+    'MARIA',                // 5.1 ?
     'MASTER',
     'MASTER_CONNECT_RETRY',
     'MASTER_HOST',
@@ -682,7 +684,7 @@ $PMA_SQPdata_reserved_word = array (
  *
  * @global integer MySQL reserved words count
  */
-$PMA_SQPdata_reserved_word_cnt = 281;
+$PMA_SQPdata_reserved_word_cnt = 282;
 /**
  * The previous array must be sorted so that the binary search work. 
  * Sometimes a word is not added in the correct order, so
diff --git a/tbl_structure.php b/tbl_structure.php
index 763f5e7f5..fe5340b6a 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -395,7 +395,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
         ?>
     </td>
     <?php
-        if ((!empty($tbl_type) && $tbl_type == 'MYISAM')
+        if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'MARIA')
             // FULLTEXT is possible on TEXT, CHAR and VARCHAR
             && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) {
             echo "\n";
@@ -448,7 +448,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
     PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', $strPrimary, 'b_primary.png');
     PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', $strUnique, 'b_unique.png');
     PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', $strIndex, 'b_index.png');
-    if ((!empty($tbl_type) && $tbl_type == 'MYISAM')) {
+    if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'MARIA')) {
         PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', $strIdxFulltext, 'b_ftext.png');
     }
 }
@@ -661,7 +661,7 @@ if ($cfg['ShowStats']) {
             <?php
         }
         // Optimize link if overhead
-        if (isset($free_size) && ($tbl_type == 'MYISAM' || $tbl_type == 'BDB')) {
+        if (isset($free_size) && ($tbl_type == 'MYISAM' || $tbl_type == 'MARIA' || $tbl_type == 'BDB')) {
             ?>
     <tr class="tblFooters">
         <td colspan="3" align="center">