nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MARIA: FULLTEXT, reserved word

Browse Source
This commit is contained in:
Marc Delisle
2008-03-17 16:38:18 +00:00
parent b11306d521
commit 03e49d15eb
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -47,6 +47,7 @@ danbarry
* minimal support on db structure page * minimal support on db structure page
* export * export
+ [pdf] Merged tcpdf 2.2.002 (PHP5 version), thanks to Nicola Asuni + [pdf] Merged tcpdf 2.2.002 (PHP5 version), thanks to Nicola Asuni
+ [engines] Maria (work in progress)
2.11.6.0 (not yet released) 2.11.6.0 (not yet released)
- bug #1903724 [interface] Displaying of very large queries in error message - bug #1903724 [interface] Displaying of very large queries in error message

6
libraries/sqlparser.data.php
View File

@@ -363,6 +363,7 @@ $PMA_SQPdata_column_attrib = array (
'INNOBASE', // Engine alias InnoDB 'INNOBASE', // Engine alias InnoDB
'INNODB', // Engine InnoDB 'INNODB', // Engine InnoDB
'ISAM', // Engine 'ISAM', // Engine
'MARIA', // Engine
'MEMORY', // Engine alias HEAP, but preferred 'MEMORY', // Engine alias HEAP, but preferred
'MERGE', // Engine 'MERGE', // Engine
'MRG_ISAM', // Engine 'MRG_ISAM', // Engine
@@ -383,7 +384,7 @@ $PMA_SQPdata_column_attrib = array (
* *
* @global integer MySQL attributes count * @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 * 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', 'LOCKS',
'LOGS', 'LOGS',
'LOW_PRIORITY', 'LOW_PRIORITY',
'MARIA', // 5.1 ?
'MASTER', 'MASTER',
'MASTER_CONNECT_RETRY', 'MASTER_CONNECT_RETRY',
'MASTER_HOST', 'MASTER_HOST',
@@ -682,7 +684,7 @@ $PMA_SQPdata_reserved_word = array (
* *
* @global integer MySQL reserved words count * @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. * The previous array must be sorted so that the binary search work.
* Sometimes a word is not added in the correct order, so * Sometimes a word is not added in the correct order, so

6
tbl_structure.php
View File

@@ -395,7 +395,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
?> ?>
</td> </td>
<?php <?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 // FULLTEXT is possible on TEXT, CHAR and VARCHAR
&& (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) { && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) {
echo "\n"; 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_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_unique', $strUnique, 'b_unique.png');
PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', $strIndex, 'b_index.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'); PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', $strIdxFulltext, 'b_ftext.png');
} }
} }
@@ -661,7 +661,7 @@ if ($cfg['ShowStats']) {
<?php <?php
} }
// Optimize link if overhead // 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"> <tr class="tblFooters">
<td colspan="3" align="center"> <td colspan="3" align="center">