1. 31 May, 2007 1 commit
  2. 28 May, 2007 5 commits
    • unknown's avatar
      BUG#21132 (Slave fails to reconnect on update_slave_list) · 61c0e4c0
      unknown authored
      This is a one liner which will fix semantics if SHOW SLAVE HOSTS to 
      display the list of slaves currently registered on the host on which
      it was issued.
      
      
      sql/slave.cc:
        Remove call to update_slave_list() which was executing "SHOW SLAVE
        HOSTS" on master and populating slave_list based on the output.
      61c0e4c0
    • unknown's avatar
      Added missing result file · aae1ff67
      unknown authored
      
      mysql-test/r/rpl_critical_errors.result:
        Missing result file
      aae1ff67
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · cf2facb5
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      cf2facb5
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · a5caa4da
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/rpl_row_mysqlbinlog.test:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      BitKeeper/deleted/.del-.del-rpl_critical_errors.result:
        Delete: BitKeeper/deleted/.del-rpl_critical_errors.result
      a5caa4da
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 9f757559
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      9f757559
  3. 24 May, 2007 10 commits
  4. 23 May, 2007 11 commits
  5. 22 May, 2007 12 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2d95236b
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/src/common/transporter/Packer.cpp:
        Auto merged
      storage/ndb/src/common/transporter/TCP_Transporter.hpp:
        Auto merged
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testNdbApi.cpp:
        manual merge
      storage/ndb/test/run-test/daily-basic-tests.txt:
        manual merge
      2d95236b
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · d06875b3
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      d06875b3
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · b8dc4b63
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      b8dc4b63
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · f529d18b
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      f529d18b
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 · 05464a4f
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      05464a4f
    • unknown's avatar
      Merge trift2.:/MySQL/M50/bug26609-5.0 · fd5b27e1
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      fd5b27e1
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · b19ae71c
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/pgman.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
        manual merge
      b19ae71c
    • unknown's avatar
      Bug #28593 cluster backup scans in acc index order, bad for disk data · f77ba282
      unknown authored
      - change to scan in tup and disk order (if applicable)
      
      
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        tup scan for backup also, not only lcp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        choose disk order scan for disktables during backup
        + move bug workaround for 27776 from tup to lqh
      storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
        add missing jamEntry
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        move bug workaround for 27776 from tup to lqh
      storage/ndb/src/kernel/blocks/pgman.cpp:
        missing jamEntry
      f77ba282
    • unknown's avatar
      Merge trift2.:/MySQL/M50/bug26609-5.0 · cd0fcf34
      unknown authored
      into  trift2.:/MySQL/M51/bug26609-5.1
      
      
      Makefile.am:
        Manual merge: Include the "row_lock" suite in the "test-bt" target.
      scripts/make_binary_distribution.sh:
        Manual merge: Include the additional test suites in the binary package.
      cd0fcf34
    • unknown's avatar
    • unknown's avatar
      scripts/make_binary_distribution.sh : · c7c3d169
      unknown authored
      Include all the additional test suites in the binary packages ("tar.gz").
      This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
      
      
      scripts/make_binary_distribution.sh:
        Include all the additional test suites (for now: "funcs_1", "funcs_2", "row_lock")
        in the binary packages ("tar.gz").
        Take them "as is", without any file filtering (except for the BK subdirectories "SCCS").
        
        This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
        
        Use this opportunity to correct the language in some comments.
      c7c3d169
    • unknown's avatar
      BUG#17654 : --read-from-remote-server causes core · b626d5d7
      unknown authored
      This patch corrects a problem encountered when reading the binlog from a remote
      host. The application was crashing because the buffer variable (temp_buf) in 
      log_event was not pointing to the incoming data. For a normal file read, this 
      buffer is allocated by a previous call of read_log_event. However, when reading
      from a remote host, the first call to read_log_event is not executed therefore
      no buffer is allocated. Furthermore, there is no need to allocate a new buffer 
      because the incoming stream is what needs to be read. 
      
      This patch adds the call to initialize the temp_buf variable if reading from a 
      remote host. It also adds a check at destroy time to ensure the temp_buf is not
      freed if reading from a remote host.
      
      
      client/mysqlbinlog.cc:
        BUG#17654 : --read-from-remote-server causes core
        
        This patch corrects a problem when reading from a remote host. The temp_buf 
        variable of the log_event class is undefined. This patch assigns the temp_buf
        variable to the address of the incoming stream. This allows the print functions
        to print the binlog events correctly.
      mysql-test/r/rpl_row_mysqlbinlog.result:
        BUG#17654 : --read-from-remote-server causes core
        
        This patch adds the results for the test that were disabled when the bug report
        was investigated. The patch also adds an additional test was added to ensure 
        the output of reading from a remote host is the same as reading from a local file.
      mysql-test/t/rpl_row_mysqlbinlog.test:
        BUG#17654 : --read-from-remote-server causes core
        
        This patch enables the portions of the test that were disabled when the bug report
        was investigated. The patch also adds an additional test was added to ensure 
        the output of reading from a remote host is the same as reading from a local file.
      b626d5d7
  6. 21 May, 2007 1 commit
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 1269a52d
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
      
      
      configure.in:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      1269a52d