[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13261-g092108b

[Piotr Przybylski]

The branch, master has been updated
       via  092108bdee43d0dd4389e323eadc7d3ae58d8a37 (commit)
       via  9d7d5f960f7da9242c9a69a7eba82e135bb52b59 (commit)
      from  efee7ec87094a31885adfe96e7667733a1c763aa (commit)


- Log -----------------------------------------------------------------
commit 092108bdee43d0dd4389e323eadc7d3ae58d8a37
Merge: 9d7d5f960f7da9242c9a69a7eba82e135bb52b59 efee7ec87094a31885adfe96e7667733a1c763aa
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Fri Aug 5 16:47:14 2011 +0200

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 9d7d5f960f7da9242c9a69a7eba82e135bb52b59
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Fri Aug 5 12:51:05 2011 +0200

    Remove unused variables

-----------------------------------------------------------------------

Summary of changes:
 libraries/server_synchronize.lib.php |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 1edbb83..a862a60 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -125,9 +125,6 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching
         }
         $update_row = 0;
         $insert_row = 0;
-        $update_field = 0;
-        $insert_field = 0;
-        $starting_index = 0;
 
         for ($j = 0; $j < $source_size; $j++) {
             $starting_index = 0;
@@ -307,11 +304,9 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma
 {
     if (isset($trg_keys[$matching_table_index])) {
         $target_key_values = PMA_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link);
-        $target_row_size = sizeof($target_key_values);
     }
     if (isset($src_keys[$matching_table_index])) {
         $source_key_values = PMA_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link);
-        $source_size = sizeof($source_key_values);
     }
     $all_keys_match = 1;
     for ($a = 0; $a < sizeof($trg_keys[$matching_table_index]); $a++) {


hooks/post-receive
-- 
phpMyAdmin