From ac649c64be121dbaefdf14716e032bfe35f21dca Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 26 Feb 2010 17:43:58 +0000 Subject: [PATCH] bug #2959746 Unknown table status: TABLE_TYPE --- ChangeLog | 1 + libraries/Table.class.php | 3 ++- libraries/database_interface.lib.php | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6bc7fbb93..2cd89f779 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly - bug #2948492 [interface] Slide effect masks some fields on search page +- bug #2959746 [interface] Unknown table status: TABLE_TYPE 3.3.0.0 (not yet released) + rfe #2308632 [edit] Use hex for (var)binary fields, diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 8055dbc09..5712c15d6 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -423,7 +423,8 @@ class PMA_Table if (! $force_exact) { if (! isset(PMA_Table::$cache[$db][$table]['Rows']) && ! $is_view) { - PMA_Table::$cache[$db][$table] = PMA_DBI_fetch_single_row('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddslashes($table, true) . '\''); + $tmp_tables = PMA_DBI_get_tables_full($db, $table); + PMA_Table::$cache[$db][$table] = $tmp_tables[$table]; } $row_count = PMA_Table::$cache[$db][$table]['Rows']; } diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 0dab59013..24a7ea44e 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -290,6 +290,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`, + `TABLE_TYPE` ÀS `TABLE_TYPE`, `ENGINE` AS `Engine`, `ENGINE` AS `Type`, `VERSION` AS `Version`,