List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:August 15 2011 7:10pm
Subject:bzr push into mysql-5.5 branch (joerg.bruehe:3494 to 3496)
View as plain text  
 3496 Joerg Bruehe	2011-08-15 [merge]
      Null-merge,
      conflict on "configure.in" which is gone from 5.5.
      No change.

 3495 Joerg Bruehe	2011-08-15 [merge]
      Null merge for pushing.

 3494 Marko Mäkelä	2011-08-15 [merge]
      Merge mysql-5.1 to mysql-5.5. Add a test case.

    added:
      mysql-test/suite/innodb/r/innodb_bug59733.result
      mysql-test/suite/innodb/t/innodb_bug59733.test
    modified:
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0pcur.c
      storage/innobase/btr/btr0sea.c
      storage/innobase/dict/dict0crea.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0btr.ic
      storage/innobase/include/sync0sync.h
      storage/innobase/sync/sync0sync.c
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (joerg.bruehe:3494 to 3496) Joerg Bruehe16 Aug