The branch, master has been updated
via c64564baf77a99fc944560e6898b57214262062d (commit)
from a73f1449ea1a18fac1853f93afa826b20811893d (commit)
- Log -----------------------------------------------------------------
commit c64564baf77a99fc944560e6898b57214262062d
Author: Piotr Przybylski <[email protected]>
Date: Fri Aug 5 00:49:31 2011 +0200
Server synchronize: fix PMA_get_table_indexes to return null when there are
no indexes instead of false
Synchronize code depends on this behavior
-----------------------------------------------------------------------
Summary of changes:
libraries/server_synchronize.lib.php | 5 ++---
server_synchronize.php | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libraries/server_synchronize.lib.php
b/libraries/server_synchronize.lib.php
index 513e7e9..5ddd07a 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -1378,13 +1378,12 @@ function PMA_get_column_values($database, $table,
$column, $link = null)
*/
function PMA_get_table_indexes($database, $table, $link = null)
{
-
$indexes = PMA_DBI_fetch_result(
'SHOW INDEXES FROM ' .PMA_backquote($database) . '.' .
PMA_backquote($table),
null, null, $link);
- if (! is_array($indexes) || count($indexes) < 1) {
- return false;
+ if (!is_array($indexes) || count($indexes) == 0) {
+ return null;
}
return $indexes;
}
diff --git a/server_synchronize.php b/server_synchronize.php
index 89e50d8..4b4322c 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -210,6 +210,7 @@ if ((isset($_REQUEST['submit_connect']))) {
*/
PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db,
$src_link, $j, $row_count);
}
+
/**
* Storing all arrays in session for use when page is reloaded for
each button press
*/
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
