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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-04-12 01:54:18 +02:00
commit 68d6618794
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -105,6 +105,7 @@ underscore
- bug #3853 Blowfish implementation might be broken (replace with phpseclib)
- bug #3865 Using like operator on each backslash needs 4 backslash protection
- bug #3860 Displayed git revision info is not set
- bug #3871 Check referential integrity broken across databases
3.5.9.0 (not yet released)

12
libraries/operations.lib.php
View File

@ -1365,7 +1365,10 @@ function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
$join_query = 'SELECT '
. PMA_Util::backquote($GLOBALS['table']) . '.*'
. ' FROM ' . PMA_Util::backquote($GLOBALS['table'])
. ' LEFT JOIN ' . PMA_Util::backquote($arr['foreign_table']);
. ' LEFT JOIN '
. PMA_Util::backquote($arr['foreign_db'])
. '.'
. PMA_Util::backquote($arr['foreign_table']);
if ($arr['foreign_table'] == $GLOBALS['table']) {
$foreign_table = $GLOBALS['table'] . '1';
$join_query .= ' AS ' . PMA_Util::backquote($foreign_table);
@ -1375,9 +1378,14 @@ function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
$join_query .= ' ON '
. PMA_Util::backquote($GLOBALS['table']) . '.'
. PMA_Util::backquote($master)
. ' = ' . PMA_Util::backquote($foreign_table) . '.'
. ' = '
. PMA_Util::backquote($arr['foreign_db'])
. '.'
. PMA_Util::backquote($foreign_table) . '.'
. PMA_Util::backquote($arr['foreign_field'])
. ' WHERE '
. PMA_Util::backquote($arr['foreign_db'])
. '.'
. PMA_Util::backquote($foreign_table) . '.'
. PMA_Util::backquote($arr['foreign_field'])
. ' IS NULL AND '