List:Commits« Previous MessageNext Message »
From:marko.makela Date:May 11 2010 5:04pm
Subject:bzr push into mysql-trunk-innodb branch (marko.makela:3082 to 3083)
View as plain text  
 3083 Marko Mäkelä	2010-05-11
      Merge from mysql-5.1-innodb:
      
        ------------------------------------------------------------
        revno: 3459
        revision-id: marko.makela@strippedeixftgzpfqt
        parent: vasil.dimov@stripped11110029-18xvuu6r7har8toh
        committer: Marko Mäkelä <marko.makela@stripped>
        branch nick: mysql-5.1-innodb2
        timestamp: Tue 2010-05-11 19:58:45 +0300
        message:
          Fix sys_vars.tx_isolation_func.test, which was broken in revno 3432
          when making READ UNCOMMITTED lock as little as READ COMMITTED.

    modified:
      mysql-test/suite/sys_vars/r/tx_isolation_func.result
      mysql-test/suite/sys_vars/t/tx_isolation_func.test
 3082 Marko Mäkelä	2010-05-11
      Merge from mysql-5.1-innodb:
      
        ------------------------------------------------------------
        revno: 3459
        revision-id: marko.makela@stripped00511105308-grp2t3prh3tqivw0
        parent: marko.makela@oracle.com-20100511105012-b2t7wvz6mu6bll74
        parent: marko.makela@stripped0
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-11 13:53:08 +0300
        message:
          Merge a patch from Facebook to fix Bug #53290
      
          commit e759bc64eb5c5eed4f75677ad67246797d486460
          Author: Ryan Mack
          Date:   3 days ago
      
              Bugfix for 53290, fast unique index creation fails on duplicate null values
      
              Summary:
              Bug in the fast index creation code incorrectly considers null
              values to be duplicates during block merging.  Innodb policy is that
              multiple null values are allowed in a unique index.  Null duplicates
              were correctly ignored while sorting individual blocks and with slow
              index creation.
      
              Test Plan:
              mtr, including new test, load dbs using deferred index creation
      
              License:
              Copyright (C) 2009-2010 Facebook, Inc.  All Rights Reserved.
      
              Dual licensed under BSD license and GPLv2.
      
              Redistribution and use in source and binary forms, with or without
              modification, are permitted provided that the following conditions are met:
              1. Redistributions of source code must retain the above copyright notice,
                 this list of conditions and the following disclaimer.
              2. Redistributions in binary form must reproduce the above copyright notice,
                 this list of conditions and the following disclaimer in the documentation
                 and/or other materials provided with the distribution.
      
              THIS SOFTWARE IS PROVIDED BY FACEBOOK, INC. ``AS IS'' AND ANY EXPRESS OR
              IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
              MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
              EVENT SHALL FACEBOOK, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
              SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
              PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
              OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
              WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
              OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
              ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      
              This program is free software; you can redistribute it and/or modify it
              under the terms of the GNU General Public License as published by the Free
              Software Foundation; version 2 of the License.
      
              This program is distributed in the hope that it will be useful, but WITHOUT
              ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
              FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
              more details.
      
              You should have received a copy of the GNU General Public License along with
              this program; if not, write to the Free Software Foundation, Inc., 59 Temple
              Place, Suite 330, Boston, MA  02111-1307  USA
            ------------------------------------------------------------
            revno: 3453.2.1
            revision-id: marko.makela@stripped
            parent: marko.makela@stripped1gklpheslrxs
            committer: Marko Mäkelä <marko.makela@stripped>
            branch nick: 5.1-innodb
            timestamp: Wed 2010-05-05 15:39:01 +0300
            message:
              Merge a contribution from Ryan Mack at Facebook:
      
              Bugfix for 53290, fast unique index creation fails on duplicate null values
      
                  Summary:
                  Bug in the fast index creation code incorrectly considers null
                  values to be duplicates during block merging.  Innodb policy is that
                  multiple null values are allowed in a unique index.  Null duplicates
                  were correctly ignored while sorting individual blocks and with slow
                  index creation.
      
                  Test Plan:
                  mtr, including new test, load dbs using deferred index creation
      
                  DiffCamp Revision: 110840
                  Reviewed By: mcallaghan
                  CC: mcallaghan, mysql-devel@lists
                  Revert Plan:
                  OK

    added:
      mysql-test/suite/innodb/r/innodb_bug53290.result
      mysql-test/suite/innodb/t/innodb_bug53290.test
    modified:
      storage/innobase/include/rem0cmp.h
      storage/innobase/rem/rem0cmp.c
      storage/innobase/row/row0merge.c
=== modified file 'mysql-test/suite/sys_vars/r/tx_isolation_func.result'
--- a/mysql-test/suite/sys_vars/r/tx_isolation_func.result	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/tx_isolation_func.result	2010-05-11 17:02:49 +0000
@@ -95,10 +95,7 @@ a	b
 22	10
 24	10
 INSERT INTO t1 VALUES(23, 23);
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 INSERT INTO t1 VALUES(25, 25);
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-Bug: Only even rows are being locked, error 1205 should'nt have occured
 SELECT * FROM t1;
 a	b
 2	10
@@ -109,7 +106,9 @@ a	b
 18	10
 20	10
 22	10
+23	23
 24	10
+25	25
 COMMIT;
 ** Connection con0 **
 COMMIT;
@@ -144,7 +143,9 @@ a	b
 18	10
 20	10
 22	10
+23	23
 24	10
+25	25
 INSERT INTO t1 VALUES(5, 5);
 INSERT INTO t1 VALUES(7, 7);
 SELECT * FROM t1;
@@ -159,7 +160,9 @@ a	b
 18	10
 20	10
 22	10
+23	23
 24	10
+25	25
 COMMIT;
 ** Connection con0 **
 COMMIT;
@@ -196,7 +199,9 @@ a	b
 18	11
 20	11
 22	11
+23	23
 24	11
+25	25
 INSERT INTO t1 VALUES(9, 9);
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 INSERT INTO t1 VALUES(13, 13);
@@ -214,7 +219,9 @@ a	b
 18	11
 20	11
 22	11
+23	23
 24	11
+25	25
 COMMIT;
 ** Connection con0 **
 COMMIT;
@@ -225,6 +232,8 @@ SELECT * FROM t1 WHERE a IN (2,4,6,8,10,
 a	b
 5	5
 7	7
+23	23
+25	25
 UPDATE t1 SET b = 13 WHERE a IN (2,4,6,8,10,12,14,16,18,20,22,24,26) = 0;
 ** Connection con1 **
 START TRANSACTION;
@@ -240,7 +249,9 @@ a	b
 18	12
 20	12
 22	12
+23	23
 24	12
+25	25
 INSERT INTO t1 VALUES(9, 9);
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 INSERT INTO t1 VALUES(13, 13);
@@ -258,7 +269,9 @@ a	b
 18	12
 20	12
 22	12
+23	23
 24	12
+25	25
 COMMIT;
 ** Connection con0 **
 COMMIT;
@@ -273,7 +286,9 @@ a	b
 18	12
 20	12
 22	12
+23	13
 24	12
+25	13
 UPDATE t1 SET b = 14 WHERE a IN (2,4,6,8) = 0;
 ** Connection con1 **
 START TRANSACTION;
@@ -289,7 +304,9 @@ a	b
 18	12
 20	12
 22	12
+23	13
 24	12
+25	13
 INSERT INTO t1 VALUES(9, 9);
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 INSERT INTO t1 VALUES(13, 13);
@@ -307,7 +324,9 @@ a	b
 18	12
 20	12
 22	12
+23	13
 24	12
+25	13
 COMMIT;
 ** Connection con0 **
 COMMIT;

=== modified file 'mysql-test/suite/sys_vars/t/tx_isolation_func.test'
--- a/mysql-test/suite/sys_vars/t/tx_isolation_func.test	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/tx_isolation_func.test	2010-05-11 17:02:49 +0000
@@ -134,12 +134,9 @@ START TRANSACTION;
 
 SELECT * FROM t1;
 
---error ER_LOCK_WAIT_TIMEOUT
 INSERT INTO t1 VALUES(23, 23);
 
---error ER_LOCK_WAIT_TIMEOUT
 INSERT INTO t1 VALUES(25, 25);
---echo Bug: Only even rows are being locked, error 1205 should'nt have occured
 
 SELECT * FROM t1;
 

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100511170249-xw6qjgbenh688nhj.bundle
Thread
bzr push into mysql-trunk-innodb branch (marko.makela:3082 to 3083) marko.makela11 May