[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2977-g82823d6

[Marc Delisle]

The branch, master has been updated
       via  82823d67feed46f061cab99c611b9561c174517f (commit)
       via  86d3b7e58c7e87b3ee1fb9cc0fcb08dd2e73d24e (commit)
      from  a7a20980067c9c9dc436e59129cb420d0badafa3 (commit)


- Log -----------------------------------------------------------------
commit 82823d67feed46f061cab99c611b9561c174517f
Merge: a7a20980067c9c9dc436e59129cb420d0badafa3 86d3b7e58c7e87b3ee1fb9cc0fcb08dd2e73d24e
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jun 5 06:14:33 2011 -0400

    Merge branch 'QA_3_4'

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

Summary of changes:
 ChangeLog |    1 +
 js/sql.js |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cff530b..5e054e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
 - bug #3311170 [sync] Missing helper icons in Synchronize
 - patch #3304473 [setup] Redefine a lable that was wrong
 - bug #3304544 [parser] master is not a reserved word
+- bug #3307616 [edit] Inline edit updates multiple duplicate rows
 
 3.4.2.0 (not yet released)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
diff --git a/js/sql.js b/js/sql.js
index 31afe84..8a76e68 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -947,6 +947,9 @@ $(document).ready(function() {
         new_clause = new_clause.substring(0, new_clause.length-5);
         new_clause = PMA_urlencode(new_clause);
         sql_query += ' WHERE ' + PMA_urldecode(where_clause);
+        // Avoid updating more than one row in case there is no primary key
+        // (happened only for duplicate rows)
+        sql_query += ' LIMIT 1';
         /**
          * @var rel_fields_list  String, url encoded representation of {@link relations_fields}
          */


hooks/post-receive
-- 
phpMyAdmin