The branch, master has been updated
via 887e2be664f04827fe164d724d233598a251bcb9 (commit)
via fd1d214d35270f881ae4a12555b1a0f467e2381a (commit)
via e6e78a1fa450674f784b7d03d31793d7384913cd (commit)
from f9f987f544cb71e44126b362f456150640d91daf (commit)
- Log -----------------------------------------------------------------
commit 887e2be664f04827fe164d724d233598a251bcb9
Merge: f9f987f544cb71e44126b362f456150640d91daf
fd1d214d35270f881ae4a12555b1a0f467e2381a
Author: Marc Delisle <[email protected]>
Date: Sun Aug 1 06:20:10 2010 -0400
fix merge conflicts
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/database_interface.lib.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9671597..06a26a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -106,6 +106,7 @@ $Id$
- bug #3031705 [core] Fix generating condition for real numbers by comparing
them to string.
- bug #3034026 [confirmation] TRUNCATE queries get no confirmation request
+- bug #3036132 [core] Triggers not fetched if dbname has an hyphen
3.3.5.0 (2010-07-26)
- patch #2932113 [information_schema] Slow export when having lots of
diff --git a/libraries/database_interface.lib.php
b/libraries/database_interface.lib.php
index c5b3ca4..8eba111 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1389,7 +1389,7 @@ function PMA_DBI_get_triggers($db, $table, $delimiter =
'//')
// instead of WHERE EVENT_OBJECT_SCHEMA='dbname'
$triggers = PMA_DBI_fetch_result("SELECT TRIGGER_SCHEMA, TRIGGER_NAME,
EVENT_MANIPULATION, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA,
EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" .
PMA_sqlAddslashes($db,true) . "' and EVENT_OBJECT_TABLE = '" .
PMA_sqlAddslashes($table, true) . "';");
} else {
- $triggers = PMA_DBI_fetch_result("SHOW TRIGGERS FROM " .
PMA_sqlAddslashes($db,true) . " LIKE '" . PMA_sqlAddslashes($table, true) .
"';");
+ $triggers = PMA_DBI_fetch_result("SHOW TRIGGERS FROM " .
PMA_backquote(PMA_sqlAddslashes($db,true)) . " LIKE '" .
PMA_sqlAddslashes($table, true) . "';");
}
if ($triggers) {
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
