1. 23 Jan, 2008 8 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 55b09d63
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      55b09d63
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · b6921d02
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      b6921d02
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 78ac242f
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
      
      
      storage/ndb/src/common/transporter/TCP_Transporter.cpp:
        Auto merged
      78ac242f
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca · e2ba0ab9
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      storage/ndb/src/common/transporter/TCP_Transporter.cpp:
        Auto merged
      e2ba0ab9
    • unknown's avatar
      ndb - bug#34005 · ac632f5c
      unknown authored
        make sure whole send buffer is flushed, even when wrapping around end
      
      
      ndb/src/common/transporter/TCP_Transporter.cpp:
        ndb - bug#34005
          make sure whole send buffer is flush, even when wrapping around end
      ac632f5c
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · bd70a104
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
      
      
      storage/ndb/src/common/util/Bitmask.cpp:
        merge
      bd70a104
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca · 71377f41
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      storage/ndb/include/util/Bitmask.hpp:
        Auto merged
      storage/ndb/src/common/util/Bitmask.cpp:
        merge
      storage/ndb/test/ndbapi/testBitfield.cpp:
        merge
      71377f41
    • unknown's avatar
      ndb - bug#33750 · a79ebb85
      unknown authored
          make sure that getField does not write after supplied buffer
          (recommit to correct clone, for easy merging)
      
      
      ndb/include/util/Bitmask.hpp:
        ndb- bug#33750
              make sure that getField does not write after supplied buffer
      ndb/src/common/util/Bitmask.cpp:
        ndb- bug#33750
              make sure that getField does not write after supplied buffer
      ndb/test/ndbapi/testBitfield.cpp:
        move test from Bitmask.cpp into testBitfield
              for automatic testing
      a79ebb85
  2. 19 Jan, 2008 1 commit
  3. 18 Jan, 2008 1 commit
    • unknown's avatar
      Add SqlResultSet · 4789e3f6
      unknown authored
      
      storage/ndb/test/include/DbUtil.hpp:
        Add support for SqlResultSet
      storage/ndb/test/ndbapi/Makefile.am:
        Add testNDBT
      storage/ndb/test/src/DbUtil.cpp:
        Add support for SqlResultSet
      storage/ndb/test/src/Makefile.am:
        Build AtrtClient
      storage/ndb/test/include/AtrtClient.hpp:
        New BitKeeper file ``storage/ndb/test/include/AtrtClient.hpp''
      storage/ndb/test/ndbapi/testNDBT.cpp:
        New BitKeeper file ``storage/ndb/test/ndbapi/testNDBT.cpp''
      storage/ndb/test/src/AtrtClient.cpp:
        New BitKeeper file ``storage/ndb/test/src/AtrtClient.cpp''
      4789e3f6
  4. 17 Jan, 2008 2 commits
  5. 11 Jan, 2008 3 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 12855ff2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
      
      
      12855ff2
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · b64f9dbe
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
      
      
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        merge
      b64f9dbe
    • unknown's avatar
      ndb - bug#33793 · e9849563
      unknown authored
        dont assume that page is "all empty"
        only as gci is acked, as release_gci might not have processed it yet
      
      
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        new error codes
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        dont assume that page is "all empty"
        only as gci is acked, as release_gci might not have processed it yet
      storage/ndb/test/ndbapi/test_event.cpp:
        testcase
      storage/ndb/test/run-test/daily-basic-tests.txt:
        testcase
      e9849563
  6. 10 Jan, 2008 14 commits
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 8a757010
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      client/mysql.cc:
        Auto merged
      8a757010
    • unknown's avatar
      Makefile.am: · ed6d97c8
      unknown authored
        Updated to build NdbRepStress
      
      
      storage/ndb/test/ndbapi/Makefile.am:
        Updated to build NdbRepStress
      ed6d97c8
    • unknown's avatar
      Makefile.am: · 2f220684
      unknown authored
        Updated for name chance on dbutil
      
      
      storage/ndb/test/src/Makefile.am:
        Updated for name chance on dbutil
      2f220684
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.1 · 824ced46
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      824ced46
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.0 · 84762ce2
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      client/mysql.cc:
        Auto merged
      84762ce2
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt · cd6dc10c
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
      
      
      sql/filesort.cc:
        Auto merged
      cd6dc10c
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · eb80c468
      unknown authored
      into  moonbone.local:/work/33675-bug-5.0-opt-mysql
      
      
      eb80c468
    • unknown's avatar
      filesort.cc: · 1a8bcceb
      unknown authored
        Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
        server crash.
        Free smaller buffer before allocating bigger one.
      
      
      sql/filesort.cc:
        Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
        server crash.
        Free smaller buffer before allocating bigger one.
      1a8bcceb
    • unknown's avatar
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 1040bea9
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      sql/field.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/subselect.result:
        Manual merge.
      mysql-test/t/subselect.test:
        Manual merge.
      sql/filesort.cc:
        Manual merge.
      1040bea9
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · dafd3f43
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      sql/set_var.cc:
        Auto merged
      dafd3f43
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug33305/my51-bug33305 · 3869d363
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      3869d363
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 · 7085583c
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      7085583c
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 · 10909bf4
      unknown authored
      into  kaamos.(none):/data/src/opt/bug33305/my51-bug33305
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/type_date.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/skip_grants.test:
        Auto merged
      mysql-test/t/type_date.test:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/skip_grants.result:
        Manual merge.
      10909bf4
  7. 09 Jan, 2008 7 commits
  8. 08 Jan, 2008 4 commits
    • unknown's avatar
      NdbRepStress.cpp: · 0f5cf864
      unknown authored
        Updated with suggestions from Magnus and other fixes and adjustments I found along the way
      DbUtil.hpp, DbUtil.cpp:
        fixes and adjustments I found along the way
      
      
      storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
        Updated with suggestions from Magnus and other fixes and adjustments I found along the way
      storage/ndb/test/src/DbUtil.cpp:
        fixes and adjustments I found along the way
      storage/ndb/test/include/DbUtil.hpp:
        fixes and adjustments I found along the way
      0f5cf864
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · e3eadd61
      unknown authored
      into  mysql.com:/data0/jebs_clones/mysql-5.1-new-ndb
      
      
      e3eadd61
    • unknown's avatar
      Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused · 8845553a
      unknown authored
      server crash.
      
      The filesort implementation has an optimization for subquery execution which
      consists of reusing previously allocated buffers. In particular the call to
      the read_buffpek_from_file function might be skipped when a big enough buffer
      for buffer descriptors (buffpeks) is already allocated. Beside allocating
      memory for buffpeks this function fills allocated buffer with data read from
      disk. Skipping it might led to using an arbitrary memory as fields' data and
      finally to a crash.
      
      Now the read_buffpek_from_file function is always called. It allocates
      new buffer only when necessary, but always fill it with correct data.
      
      
      sql/filesort.cc:
        Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
        server crash.Now the read_buffpek_from_file function is always called. It allocates
        new buffer only when necessary, but always fill it with correct data.
      mysql-test/r/subselect.result:
        Added a test case for the bug#33675: Usage of an uninitialized memory by
        filesort in a subquery caused server crash.
      mysql-test/t/subselect.test:
        Added a test case for the bug#33675: Usage of an uninitialized memory by
        filesort in a subquery caused server crash.
      8845553a
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · d4045eed
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        Auto merged
      d4045eed