CONVERT is for MySQL >= 4.1 and not for MySQL >= 4.0.
This commit is contained in:
@@ -15,7 +15,8 @@ $Source$
|
|||||||
|
|
||||||
2004-08-16 Michal Čihař <michal@cihar.com>
|
2004-08-16 Michal Čihař <michal@cihar.com>
|
||||||
* read_dump.php: Fix handling of comments -- and # (bug #1009494).
|
* read_dump.php: Fix handling of comments -- and # (bug #1009494).
|
||||||
* libraries/relation.lib.php: Fix typo.
|
* libraries/relation.lib.php: Fix typo, CONVERT is for MySQL >= 4.1 and
|
||||||
|
not for MySQL >= 4.0.
|
||||||
|
|
||||||
2004-08-15 Marc Delisle <lem9@users.sourceforge.net>
|
2004-08-15 Marc Delisle <lem9@users.sourceforge.net>
|
||||||
(Patches from Michael Keck)
|
(Patches from Michael Keck)
|
||||||
|
@@ -279,7 +279,7 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') {
|
|||||||
if ($cfgRelation['relwork'] && ($source == 'both' || $source == 'internal')) {
|
if ($cfgRelation['relwork'] && ($source == 'both' || $source == 'internal')) {
|
||||||
$rel_query = 'SELECT master_field, foreign_db, foreign_table, foreign_field'
|
$rel_query = 'SELECT master_field, foreign_db, foreign_table, foreign_field'
|
||||||
. ' FROM ' . PMA_backquote($cfgRelation['relation']);
|
. ' FROM ' . PMA_backquote($cfgRelation['relation']);
|
||||||
if (PMA_MYSQL_INT_VERSION >= 40000) {
|
if (PMA_MYSQL_INT_VERSION >= 40100) {
|
||||||
list($conn_charset) = explode('_', $GLOBALS['collation_connection']);
|
list($conn_charset) = explode('_', $GLOBALS['collation_connection']);
|
||||||
$rel_query .= ' WHERE CONVERT(master_db USING ' . $conn_charset . ') = \'' . PMA_sqlAddslashes($db) . '\' '
|
$rel_query .= ' WHERE CONVERT(master_db USING ' . $conn_charset . ') = \'' . PMA_sqlAddslashes($db) . '\' '
|
||||||
. ' AND CONVERT(master_table USING ' . $conn_charset . ') = \'' . PMA_sqlAddslashes($table) . '\' ';
|
. ' AND CONVERT(master_table USING ' . $conn_charset . ') = \'' . PMA_sqlAddslashes($table) . '\' ';
|
||||||
|
Reference in New Issue
Block a user