The branch, QA_3_3 has been updated via fd1d214d35270f881ae4a12555b1a0f467e2381a (commit) from e6e78a1fa450674f784b7d03d31793d7384913cd (commit)
- Log ----------------------------------------------------------------- commit fd1d214d35270f881ae4a12555b1a0f467e2381a Author: Marc Delisle marc@infomarc.info Date: Sun Aug 1 06:17:03 2010 -0400
bug #3036132 [core] Triggers not fetched if dbname has an hyphen
-----------------------------------------------------------------------
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 3482348..b570447 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - 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 a7d9e72..501c34d 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1401,7 +1401,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