• marko's avatar
    branches/zip: Merge revisions 6669:6788 from branches/5.1: · 33ebfa0b
    marko authored
      ------------------------------------------------------------------------
      r6774 | calvin | 2010-03-03 23:56:10 +0200 (Wed, 03 Mar 2010) | 2 lines
      Changed paths:
         M /branches/5.1/trx/trx0sys.c
    
      branches/5.1: fix bug#51653: outdated reference to set-variable
      Non functional change.
      ------------------------------------------------------------------------
      r6780 | vasil | 2010-03-08 19:13:20 +0200 (Mon, 08 Mar 2010) | 4 lines
      Changed paths:
         M /branches/5.1/plug.in
    
      branches/5.1:
    
      Whitespace fixup.
      ------------------------------------------------------------------------
      r6783 | jyang | 2010-03-09 17:54:14 +0200 (Tue, 09 Mar 2010) | 9 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
         M /branches/5.1/mysql-test/innodb_bug21704.result
         A /branches/5.1/mysql-test/innodb_bug47621.result
         A /branches/5.1/mysql-test/innodb_bug47621.test
    
      branches/5.1: Fix bug #47621 "MySQL and InnoDB data dictionaries
      will become out of sync when renaming columns". MySQL does not
      provide new column name information to storage engine to
      update the system table. To avoid column name mismatch, we shall
      just request a table copy for now.
    
      rb://246 approved by Marko.
      ------------------------------------------------------------------------
      r6785 | vasil | 2010-03-10 09:04:38 +0200 (Wed, 10 Mar 2010) | 11 lines
      Changed paths:
         M /branches/5.1/mysql-test/innodb_bug38231.test
    
      branches/5.1:
    
      Add the missing --reap statements in innodb_bug38231.test. Probably MySQL
      enforced the presence of those recently and the test started failing like:
    
        main.innodb_bug38231                     [ fail ]
                Test ended at 2010-03-10 08:48:32
    
        CURRENT_TEST: main.innodb_bug38231
        mysqltest: At line 49: Cannot run query on connection between send and reap
      ------------------------------------------------------------------------
      r6788 | vasil | 2010-03-10 10:53:21 +0200 (Wed, 10 Mar 2010) | 8 lines
      Changed paths:
         M /branches/5.1/mysql-test/innodb_bug38231.test
    
      branches/5.1:
    
      In innodb_bug38231.test: replace the fragile sleep 0.2 that depends on timing
      with a more robust condition which waits for the TRUNCATE and LOCK commands
      to appear in information_schema.processlist. This could also break if there
      are other sessions executing the same SQL commands, but there are none during
      the execution of the mysql test.
      ------------------------------------------------------------------------
    33ebfa0b
trx0sys.c 43.1 KB