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

Do not get TABLES as table name, it's used on some queries by MySQL 5.0.x (bug #1266623).

Browse Source
This commit is contained in:
Michal Čihař
2005-08-23 12:14:36 +00:00
parent 6268182df8
commit b8ece09b6b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2005-08-23 Michal Čihař <michal@cihar.com> 2005-08-23 Michal Čihař <michal@cihar.com>
* libraries/database_interface.lib.php: Abide cfg['Lang'] settings even if * libraries/database_interface.lib.php: Abide cfg['Lang'] settings even if
using MySQL > 4.1.x (bug #1266626). using MySQL > 4.1.x (bug #1266626).
* libraries/display_tbl.lib.php: Do not get TABLES as table name, it's
used on some queries by MySQL 5.0.x (bug #1266623).
2005-08-22 Michal Čihař <michal@cihar.com> 2005-08-22 Michal Čihař <michal@cihar.com>
* error.php, libraries/common.lib.php, libraries/sanitizing.lib.php: * error.php, libraries/common.lib.php, libraries/sanitizing.lib.php:

9
libraries/display_tbl.lib.php
View File

@@ -1778,7 +1778,14 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
// 2.3 Displays the navigation bars // 2.3 Displays the navigation bars
if (!isset($table) || strlen(trim($table)) == 0) { if (!isset($table) || strlen(trim($table)) == 0) {
$table = $fields_meta[0]->table; /* TABLES is returned as table name for queries like SHOW TABLE
* STATUS FROM phpmyadmin on MySQL 5.0.x, see bug #1266623 for
* more details. --Nijel */
if ($fields_meta[0]->table == 'TABLES') {
$table = '';
} else {
$table = $fields_meta[0]->table;
}
} }
if ($is_display['nav_bar'] == '1') { if ($is_display['nav_bar'] == '1') {
PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_sql_query); PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_sql_query);