1. 19 Jun, 2007 3 commits
  2. 18 Jun, 2007 6 commits
  3. 17 Jun, 2007 8 commits
  4. 16 Jun, 2007 3 commits
  5. 15 Jun, 2007 15 commits
    • unknown's avatar
      binlog.result, binlog.test: · 651a8e7f
      unknown authored
        Post-merge fix: replace xid=* with XID to isolate from number of transactions
      
      
      mysql-test/r/binlog.result:
        Post-merge fix: replace xid=* with XID to isolate from number of transactions
      mysql-test/t/binlog.test:
        Post-merge fix: replace xid=* with XID to isolate from number of transactions
      651a8e7f
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 3982f318
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
      
      
      3982f318
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c2db927b
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
      
      
      configure.in:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      c2db927b
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 559bc939
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      559bc939
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-amain · 30057f67
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      30057f67
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-ateam · 352d6489
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      352d6489
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-amain · 82f757ff
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      82f757ff
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 08d2e29c
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      08d2e29c
    • unknown's avatar
      Fix for bug #28144: "Slave_IO_Running" differs in replication tests · d2f858ab
      unknown authored
      Problem: show slave status may return different Slave_IO_Running values running some tests.
      Fix: wait for a certain slave state if needed to get tests more predictable.
      
      
      mysql-test/r/rpl_log_pos.result:
        Fix for bug #28144: "Slave_IO_Running" differs in replication tests
          - test result adjusted.
      mysql-test/r/rpl_ssl.result:
        Fix for bug #28144: "Slave_IO_Running" differs in replication tests
          - test result adjusted.
      mysql-test/t/rpl_log_pos.test:
        Fix for bug #28144: "Slave_IO_Running" differs in replication tests
          - test has been rewritten to get certain slave state, now we use wait_for_slave_param.inc
            to ensure we get proper IO/SQL slave's threads states.
      mysql-test/t/rpl_ssl.test:
        Fix for bug #28144: "Slave_IO_Running" differs in replication tests
          - wait_for_slave_to_start.inc used to get certain slave states in order 
            to be more predictable.
      mysql-test/include/wait_for_slave_param.inc:
        New BitKeeper file ``mysql-test/include/wait_for_slave_param.inc''
        
        allow to wait until SHOW SLAVE STATUS has returned a spicified value.
      d2f858ab
    • unknown's avatar
      follow-up fix · 9bba1059
      unknown authored
      
      include/violite.h:
        this may already be defined
      9bba1059
    • unknown's avatar
      Backport of · 60829746
      unknown authored
      mysql-test/include/wait_for_slave_io_to_stop.inc
      mysql-test/include/wait_for_slave_sql_to_stop.inc
      mysql-test/include/wait_for_slave_to_start.inc
      mysql-test/include/wait_for_slave_to_stop.inc
      from 5.1
      
      
      mysql-test/include/wait_for_slave_io_to_stop.inc:
        New BitKeeper file ``mysql-test/include/wait_for_slave_io_to_stop.inc''
      mysql-test/include/wait_for_slave_sql_to_stop.inc:
        New BitKeeper file ``mysql-test/include/wait_for_slave_sql_to_stop.inc''
      mysql-test/include/wait_for_slave_to_start.inc:
        New BitKeeper file ``mysql-test/include/wait_for_slave_to_start.inc''
      mysql-test/include/wait_for_slave_to_stop.inc:
        New BitKeeper file ``mysql-test/include/wait_for_slave_to_stop.inc''
      60829746
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 57726dc0
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
      
      
      57726dc0
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 288917f5
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
      
      
      288917f5
    • unknown's avatar
      Added yassl and taocrypt sources to mysqlclientlib · 8ebcb3ee
      unknown authored
      
      client/CMakeLists.txt:
        Fix for bug #27861: unresolved externals (yassl and taocrypt)
      8ebcb3ee
    • unknown's avatar
      Bug#28862 Extended Latin1 characters get lost in CVS engine · 39700afd
      unknown authored
        Problem: Temporary buffer which is used for quoting and escaping
        was initialized to character set utf8, and thus didn't allow
        to store data in other character sets.
        Fix: changing character set of the buffer to be able to
        store any arbitrary sequence of bytes.
      
      
      mysql-test/r/csv.result:
        Adding test case
      mysql-test/t/csv.test:
        Adding test case
      sql/examples/ha_tina.cc:
        Changing character set of the buffer to "binary".
      39700afd
  6. 14 Jun, 2007 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 578b81bb
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      configure.in:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      578b81bb
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · cb93ff4d
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/binlog.result:
        Auto merged
      mysql-test/r/have_log_bin.require:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932_notembedded.test:
        Auto merged
      mysql-test/t/binlog.test:
        Auto merged
      mysql-test/t/ctype_cp932_binlog.test:
        Auto merged
      mysql-test/t/ctype_ucs_binlog.test:
        Auto merged
      mysql-test/t/flush_block_commit_notembedded.test:
        Auto merged
      mysql-test/t/insert_select-binlog.test:
        Auto merged
      mysql-test/t/mysqlbinlog-cp932.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/sp_trans.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Use local
      mysql-test/t/blackhole.test:
        manual merge
      mysql-test/t/drop_temp_table.test:
        manual merge
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Use local
      mysql-test/t/mysqlbinlog.test:
        Use local
      cb93ff4d
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · a3c2ebbc
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
      
      
      a3c2ebbc
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 863a953e
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      863a953e
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · e4c320bf
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      e4c320bf