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

native comments

Browse Source
This commit is contained in:
Marc Delisle
2005-03-06 12:33:19 +00:00
parent f7da2e9bfb
commit e430651d24
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-03-06 Marc Delisle <lem9@users.sourceforge.net>
* libraries/relation.lib.php, /display_export.lib.php,
/export/sql.php: native comments. For MySQL 4.1.x+ I do not display
the "Add into comments ... Comments" choice, since they are
part of the structure
2005-03-06 Alexander M. Turek <me@derrabus.de> 2005-03-06 Alexander M. Turek <me@derrabus.de>
* lang/*.inc.php, libraries/engines/innodb.lib.php: InnoDB buffer pool * lang/*.inc.php, libraries/engines/innodb.lib.php: InnoDB buffer pool
activity statistics. activity statistics.
@@ -15,8 +21,6 @@ $Source$
* tbl_alter.php, tbl_addfield.php, db_datadict.php, pdf_schema.php, * tbl_alter.php, tbl_addfield.php, db_datadict.php, pdf_schema.php,
tbl_create.php, libraries/common.lib.php, /relation.lib.php, tbl_create.php, libraries/common.lib.php, /relation.lib.php,
/database_interface.lib.php: MySQL 4.1.x native comments /database_interface.lib.php: MySQL 4.1.x native comments
(First phase of merge, so it's experimental.
TODO: export and native comments; tbl_move_copy)
2005-03-05 Alexander M. Turek <me@derrabus.de> 2005-03-05 Alexander M. Turek <me@derrabus.de>
* server_engines.php, lang/*.inc.php, libraries/storage_engines.lib.php * server_engines.php, lang/*.inc.php, libraries/storage_engines.lib.php

2
libraries/display_export.lib.php
View File

@@ -227,7 +227,7 @@ if (!$hide_structure) { ?>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="sql_relation" value="yes" id="checkbox_sql_use_relation" <?php PMA_exportCheckboxCheck('sql_relation'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_relation"><?php echo $strRelations; ?></label><br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="sql_relation" value="yes" id="checkbox_sql_use_relation" <?php PMA_exportCheckboxCheck('sql_relation'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_relation"><?php echo $strRelations; ?></label><br />
<?php <?php
} // end relation } // end relation
if (!empty($cfgRelation['commwork'])) { if (!empty($cfgRelation['commwork']) && PMA_MYSQL_INT_VERSION < 40100) {
?> ?>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="sql_comments" value="yes" id="checkbox_sql_use_comments" <?php PMA_exportCheckboxCheck('sql_comments'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_comments"><?php echo $strComments; ?></label><br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="sql_comments" value="yes" id="checkbox_sql_use_comments" <?php PMA_exportCheckboxCheck('sql_comments'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_comments"><?php echo $strComments; ?></label><br />
<?php <?php

5
libraries/export/sql.php
View File

@@ -331,8 +331,11 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_comm
$schema_create = ''; $schema_create = '';
// triggered only for MySQL < 4.1.x (pmadb-style comments)
if ($do_comments && $cfgRelation['commwork']) { if ($do_comments && $cfgRelation['commwork']) {
if (!($comments_map = PMA_getComments($db, $table))) unset($comments_map); if (!($comments_map = PMA_getComments($db, $table))) {
unset($comments_map);
}
} }
// Check if we can use Relations (Mike Beck) // Check if we can use Relations (Mike Beck)

1
libraries/relation.lib.php
View File

@@ -523,6 +523,7 @@ function PMA_handleSlashes($val) {
* @param string the name of the column * @param string the name of the column
* @param string the value of the column * @param string the value of the column
* @param string (optional) if a column is renamed, this is the name of the former key which will get deleted * @param string (optional) if a column is renamed, this is the name of the former key which will get deleted
* @param string whether we set pmadb comments, native comments or both
* *
* @return boolean true, if comment-query was made. * @return boolean true, if comment-query was made.
* *