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

bug #1715709 export in SQL format always includes procedures and functions

Browse Source
This commit is contained in:
Marc Delisle
2007-05-20 19:00:38 +00:00
parent 646d6c0875
commit 0305d314e2
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -17,6 +17,7 @@ $HeadURL$
- bug #1721002 db rename -> undefined cfgRelation, thanks to Juergen Wind
- bug #1721571 CREATE database privilege not always detected,
thanks to Gordon McNaughton
- bug #1715709 export in SQL format always includes procedures and functions
2.10.1.0 (2007-04-23)
=====================

1
libraries/config.default.php
View File

@@ -328,6 +328,7 @@ $cfg['Export']['sql_use_transaction'] = FALSE;
$cfg['Export']['sql_drop_database'] = FALSE;
$cfg['Export']['sql_drop_table'] = FALSE;
$cfg['Export']['sql_if_not_exists'] = FALSE;
$cfg['Export']['sql_procedure_function'] = FALSE;
$cfg['Export']['sql_auto_increment'] = TRUE;
$cfg['Export']['sql_backquotes'] = TRUE;
$cfg['Export']['sql_dates'] = FALSE;

4
libraries/export/sql.php
View File

@@ -68,6 +68,8 @@ if (isset($plugin_list)) {
array('type' => 'bool', 'name' => 'auto_increment', 'text' => 'strAddAutoIncrement');
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'backquotes', 'text' => 'strUseBackquotes');
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf($GLOBALS['strAddClause'], 'CREATE PROCEDURE / FUNCTION'));
/* MIME stuff etc. */
$plugin_list['sql']['options'][] =
@@ -312,7 +314,7 @@ function PMA_exportDBFooter($db)
unset($GLOBALS['sql_constraints']);
}
if (PMA_MYSQL_INT_VERSION >= 50000 && isset($GLOBALS['sql_structure'])) {
if (PMA_MYSQL_INT_VERSION >= 50000 && isset($GLOBALS['sql_structure']) && isset($GLOBALS['sql_procedure_function'])) {
$procs_funcs = '';
$procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');