The branch, master has been updated
via 5403fc13ced5e245632ba1b4f237ff5f1a52785f (commit)
from 67224c407e95f5f1ba937d670f8e148da66afd39 (commit)
- Log -----------------------------------------------------------------
commit 5403fc13ced5e245632ba1b4f237ff5f1a52785f
Author: Piotr Przybylski <[email protected]>
Date: Sat Jun 25 00:49:41 2011 +0200
PMA_MYSQL_INT_VERSION is at least 50001 (MySQL 5.0.1)
-----------------------------------------------------------------------
Summary of changes:
db_operations.php | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/db_operations.php b/db_operations.php
index 94f8575..c5c0fc2 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -69,37 +69,36 @@ if (strlen($db) && (! empty($db_rename) || !
empty($db_copy))) {
$GLOBALS['pma']->databases->build();
}
- if (PMA_MYSQL_INT_VERSION >= 50000) {
- // here I don't use DELIMITER because it's not part of the
- // language; I have to send each statement one by one
-
- // to avoid selecting alternatively the current and new db
- // we would need to modify the CREATE definitions to qualify
- // the db name
- $procedure_names = PMA_DBI_get_procedures_or_functions($db,
'PROCEDURE');
- if ($procedure_names) {
- foreach($procedure_names as $procedure_name) {
- PMA_DBI_select_db($db);
- $tmp_query = PMA_DBI_get_definition($db, 'PROCEDURE',
$procedure_name);
- // collect for later display
- $GLOBALS['sql_query'] .= "\n" . $tmp_query;
- PMA_DBI_select_db($newname);
- PMA_DBI_query($tmp_query);
- }
+ // here I don't use DELIMITER because it's not part of the
+ // language; I have to send each statement one by one
+
+ // to avoid selecting alternatively the current and new db
+ // we would need to modify the CREATE definitions to qualify
+ // the db name
+ $procedure_names = PMA_DBI_get_procedures_or_functions($db,
'PROCEDURE');
+ if ($procedure_names) {
+ foreach($procedure_names as $procedure_name) {
+ PMA_DBI_select_db($db);
+ $tmp_query = PMA_DBI_get_definition($db, 'PROCEDURE',
$procedure_name);
+ // collect for later display
+ $GLOBALS['sql_query'] .= "\n" . $tmp_query;
+ PMA_DBI_select_db($newname);
+ PMA_DBI_query($tmp_query);
}
+ }
- $function_names = PMA_DBI_get_procedures_or_functions($db,
'FUNCTION');
- if ($function_names) {
- foreach($function_names as $function_name) {
- PMA_DBI_select_db($db);
- $tmp_query = PMA_DBI_get_definition($db, 'FUNCTION',
$function_name);
- // collect for later display
- $GLOBALS['sql_query'] .= "\n" . $tmp_query;
- PMA_DBI_select_db($newname);
- PMA_DBI_query($tmp_query);
- }
+ $function_names = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION');
+ if ($function_names) {
+ foreach($function_names as $function_name) {
+ PMA_DBI_select_db($db);
+ $tmp_query = PMA_DBI_get_definition($db, 'FUNCTION',
$function_name);
+ // collect for later display
+ $GLOBALS['sql_query'] .= "\n" . $tmp_query;
+ PMA_DBI_select_db($newname);
+ PMA_DBI_query($tmp_query);
}
}
+
// go back to current db, just in case
PMA_DBI_select_db($db);
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense..
http://p.sf.net/sfu/splunk-d2d-c1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
