List:Commits« Previous MessageNext Message »
From:MatthiasLeichmleich Date:June 20 2008 11:53am
Subject:bzr commit into mysql-6.0 tree (MatthiasLeichmleich:2676)
View as plain text  
#At file:///work2/6.0/mysql-6.0-bugteam-funcs_1/

------------------------------------------------------------
revno: 2676
revision-id: mleich@stripped
parent: mleich@stripped
parent: gshchepa@stripped
committer: Matthias Leich mleich@stripped
branch nick: mysql-6.0-bugteam-funcs_1
timestamp: Fr 2008-06-20 13:53:06 +0200
message:
  Automatic merge
modified:
  mysql-test/extra/rpl_tests/rpl_row_basic.test sp1f-rpl_row_basic.inc-20051222053451-qbja3f3vz3mf5ikwca7eeqkxutnnzlbi
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result sp1f-rpl_row_basic_2myisa-20051222053452-4mwybeg7asrg6l6usde7gfdw6u4cmx2h
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result sp1f-rpl_row_basic_3innod-20051222053452-vbynyu35bdhjizxhznism7jalbzil7l2
  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result sp1f-rpl_row_basic_7ndb.r-20060112185042-qnln6taptlwuulawjqhqz4q3noofqdfa
  sql/field.h                    sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
    ------------------------------------------------------------
    revno: 2674.1.1
    revision-id: gshchepa@stripped
    parent: kgeorge@stripped
    parent: gshchepa@stripped
    committer: Gleb Shchepa <gshchepa@stripped>
    branch nick: mysql-6.0-bugteam
    timestamp: Do 2008-06-19 18:30:10 +0500
    message:
      auto merge with local tree (bug #37076)
    modified:
      mysql-test/extra/rpl_tests/rpl_row_basic.test sp1f-rpl_row_basic.inc-20051222053451-qbja3f3vz3mf5ikwca7eeqkxutnnzlbi
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result sp1f-rpl_row_basic_2myisa-20051222053452-4mwybeg7asrg6l6usde7gfdw6u4cmx2h
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result sp1f-rpl_row_basic_3innod-20051222053452-vbynyu35bdhjizxhznism7jalbzil7l2
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result sp1f-rpl_row_basic_7ndb.r-20060112185042-qnln6taptlwuulawjqhqz4q3noofqdfa
      sql/field.h                    sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
    ------------------------------------------------------------
    revno: 2497.253.1
    revision-id: gshchepa@stripped
    parent: mattiasj@stripped
    committer: Gleb Shchepa <gshchepa@stripped>
    branch nick: 5.1-bugteam-37076
    timestamp: Do 2008-06-19 18:02:04 +0500
    message:
      Fixed bug #37076: TIMESTAMP/DATETIME/DATE values are not
                        replicated correctly between machines with
                        mixed endiannes
    modified:
      mysql-test/extra/rpl_tests/rpl_row_basic.test sp1f-rpl_row_basic.inc-20051222053451-qbja3f3vz3mf5ikwca7eeqkxutnnzlbi
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result sp1f-rpl_row_basic_2myisa-20051222053452-4mwybeg7asrg6l6usde7gfdw6u4cmx2h
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result sp1f-rpl_row_basic_3innod-20051222053452-vbynyu35bdhjizxhznism7jalbzil7l2
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result sp1f-rpl_row_basic_7ndb.r-20060112185042-qnln6taptlwuulawjqhqz4q3noofqdfa
      sql/field.h                    sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp

Attachment: [text/text/x-diff] patch-2676.diff
Thread
• bzr commit into mysql-6.0 tree (MatthiasLeichmleich:2676) MatthiasLeichmleich20 Jun