1. 12 Apr, 2010 2 commits
  2. 09 Apr, 2010 7 commits
  3. 08 Apr, 2010 2 commits
    • Vasil Dimov's avatar
      Adjust mysql-test/suite/binlog/t/binlog_killed.test after a change · 186ffeb3
      Vasil Dimov authored
      in behavior in InnoDB. The change in behavior was introduced by this
      changeset:
      
        ------------------------------------------------------------
        revno: 3370
        revision-id: vasil.dimov@oracle.com-20100331130613-8ja7n0vh36a80457
        parent: vasil.dimov@oracle.com-20100331130440-l0y517y3mjsjqy4v
        parent: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Wed 2010-03-31 16:06:13 +0300
        message:
          Merge from innodb-branches-5.1
            ------------------------------------------------------------
            revno: 0.1.819
            revision-id: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c
            parent: vasil.dimov@oracle.com-20100331064722-9rc3wypzmer7d6jj
            parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918
            committer: Vasil Dimov <vasil.dimov@oracle.com>
            branch nick: innodb-branches-5.1
            timestamp: Wed 2010-03-31 14:31:19 +0300
            message:
              Merge from SVN
                ------------------------------------------------------------
                revno: 0.2.1
                revision-id: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918
                parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6912
                committer: mmakela
                timestamp: Wed 2010-03-31 07:14:51 +0000
                message:
                  branches/5.1: Obey KILL during a lock wait (Bug #51920).
        
                  srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread():
                  Check trx_is_interrupted() in addition to checking the lock wait timeout.
        
                  rb://279 approved by Sunny Bains
      186ffeb3
    • vdimov's avatar
      branches/zip: Adjust the innodb test after change in behavior in MySQL · c03341a0
      vdimov authored
      The change in behavior was introduced by this changeset:
      
        ------------------------------------------------------------
        revno: 3405
        revision-id: joro@sun.com-20100317141846-es0qyf5zcqb0hu1c
        parent: davi.arnaut@sun.com-20100309125156-z2c4uyqque49v61k
        committer: Georgi Kodinov <joro@sun.com>
        branch nick: B49838-5.1-bugteam
        timestamp: Wed 2010-03-17 16:18:46 +0200
        message:
          Bug #49838: DROP INDEX and ADD UNIQUE INDEX for same index may corrupt
             definition at engine
          
          If a single ALTER TABLE contains both DROP INDEX and ADD INDEX using 
          the same index name (a.k.a. index modification) we need to disable 
          in-place alter table because we can't ask the storage engine to have 
          two copies of the index with the same name even temporarily (if we 
          first do the ADD INDEX and then DROP INDEX) and we can't modify 
          indexes that are needed by e.g. foreign keys if we first do 
          DROP INDEX and then ADD INDEX.
          Fixed the problem by disabling in-place ALTER TABLE for these cases.
        modified:
          mysql-test/r/innodb_mysql.result sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv
          mysql-test/t/innodb_mysql.test sp1f-innodb_mysql.test-20060816102624-6ymo37d3nyhvbqyzqn5ohsfuydwo426k
          sql/sql_table.cc               sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
      c03341a0
  4. 07 Apr, 2010 20 commits
  5. 06 Apr, 2010 9 commits