The branch, master has been updated
via 49658988032278d3321d862cd0ec907e2c39fd1b (commit)
via 6fe137e68dc1a5ed97dafd2864e8e2fda5937a96 (commit)
from c64564baf77a99fc944560e6898b57214262062d (commit)
- Log -----------------------------------------------------------------
commit 49658988032278d3321d862cd0ec907e2c39fd1b
Author: Piotr Przybylski <[email protected]>
Date: Fri Aug 5 01:16:02 2011 +0200
Always get full information here
commit 6fe137e68dc1a5ed97dafd2864e8e2fda5937a96
Author: Piotr Przybylski <[email protected]>
Date: Fri Aug 5 01:15:37 2011 +0200
PMA_DBI_get_columns - return null when there are no columns (server
synchronize depends on this behavior)
-----------------------------------------------------------------------
Summary of changes:
libraries/database_interface.lib.php | 4 ++--
tbl_structure.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libraries/database_interface.lib.php
b/libraries/database_interface.lib.php
index 4490a2c..54b4af3 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -841,8 +841,8 @@ function PMA_DBI_get_columns($database, $table, $full =
false, $link = null)
'SHOW ' . ($full ? 'FULL' : '') . ' COLUMNS
FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table),
'Field', null, $link);
- if (! is_array($fields) || count($fields) < 1) {
- return false;
+ if (! is_array($fields) || count($fields) == 0) {
+ return null;
}
return $fields;
}
diff --git a/tbl_structure.php b/tbl_structure.php
index 077603c..1b39340 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -123,7 +123,7 @@ foreach (PMA_Index::getFromTable($table, $db) as $index) {
unset($index, $columns, $column_name, $dummy);
// 3. Get fields
-$fields = PMA_DBI_get_columns($db, $table, !PMA_DRIZZLE);
+$fields = PMA_DBI_get_columns($db, $table, true);
$fields_cnt = count($fields);
// Get more complete field information
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
