1. 25 Jan, 2008 2 commits
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · ccb99965
      unknown authored
      into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      ccb99965
    • unknown's avatar
      ndb_restore.result, ndb_restore.test: · 77b2e8f3
      unknown authored
        Changed to use information_schema to check auto_increment
      Ndb.cpp:
        Bug #33534   Bad performance of INSERT's in auto_incremented tables: Saving highest seen value when setting auto_increment fields
      ndb_auto_increment.result:
        Regenerated result
      
      
      mysql-test/suite/ndb/r/ndb_auto_increment.result:
        Regenerated result
      mysql-test/suite/ndb/r/ndb_restore.result:
        Changed to use information_schema to check auto_increment
      mysql-test/suite/ndb/t/ndb_restore.test:
        Changed to use information_schema to check auto_increment
      storage/ndb/src/ndbapi/Ndb.cpp:
        Bug #33534   Bad performance of INSERT's in auto_incremented tables: Saving highest seen value when setting auto_increment fields
      77b2e8f3
  2. 24 Jan, 2008 10 commits
  3. 23 Jan, 2008 25 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 25d59622
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      mysql-test/r/view.result:
        Auto merged
      25d59622
    • unknown's avatar
      correct result to be the same as in 5.0 · 6fc612e8
      unknown authored
      6fc612e8
    • unknown's avatar
      config.medium.ini.sh, config.small.ini.sh, config.huge.ini.sh: · f8ad0918
      unknown authored
        Sample cluster configuration files for 5.1
      Makefile.am:
        Updated for new files
      
      
      support-files/config.huge.ini.sh:
        Sample cluster configuration files for 5.1
      support-files/config.medium.ini.sh:
        Sample cluster configuration files for 5.1
      support-files/config.small.ini.sh:
        Sample cluster configuration files for 5.1
      support-files/Makefile.am:
        Updated for new files
      f8ad0918
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 102d4dec
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      102d4dec
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · 6aa6e966
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      6aa6e966
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 34f792c3
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
      
      
      34f792c3
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj · 1c1a17e2
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
      
      
      storage/ndb/src/common/transporter/TCP_Transporter.cpp:
        Auto merged
      storage/ndb/src/common/util/Bitmask.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testBitfield.cpp:
        Auto merged
      1c1a17e2
    • 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/mysql-5.0 · 44236981
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
      
      
      44236981
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · efe8fd91
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
      
      
      storage/ndb/src/common/transporter/TCP_Transporter.cpp:
        Auto merged
      storage/ndb/src/common/util/Bitmask.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testBitfield.cpp:
        Auto merged
      efe8fd91
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj · 957d2e11
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      storage/ndb/src/common/transporter/TCP_Transporter.cpp:
        Auto merged
      storage/ndb/src/common/util/Bitmask.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testBitfield.cpp:
        Auto merged
      957d2e11
    • 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 whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · e69bf055
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
      
      
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        manual merge
      e69bf055
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e95e266d
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
      
      
      e95e266d
    • 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
      Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca · aa7b1b54
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-ndb
      
      
      ndb/src/common/transporter/TCP_Transporter.cpp:
        Auto merged
      aa7b1b54
    • 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 mysql.com:/home/marty/MySQL/mysql-5.0-ndb · 398fcf97
      unknown authored
      into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
      
      
      398fcf97
    • unknown's avatar
      Ndb.hpp: · 0f151f6b
      unknown authored
        Changed function attribute names to match implementation
      
      
      ndb/include/ndbapi/Ndb.hpp:
        Changed function attribute names to match implementation
      0f151f6b
    • unknown's avatar
      Ndb.hpp, Ndb.cpp, ha_ndbcluster.cc: · 7e6ab3a0
      unknown authored
        Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
      ndb_restore.result:
        Updated result file
      
      
      mysql-test/suite/ndb/r/ndb_restore.result:
        Updated result file
      sql/ha_ndbcluster.cc:
        Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
      storage/ndb/include/ndbapi/Ndb.hpp:
        Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
      storage/ndb/src/ndbapi/Ndb.cpp:
        Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
      7e6ab3a0
    • 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
      Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca · 472fe417
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-ndb
      
      
      ndb/src/common/util/Bitmask.cpp:
        merge
      ndb/test/ndbapi/testBitfield.cpp:
        merge
      472fe417
    • 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
  4. 22 Jan, 2008 3 commits
    • unknown's avatar
      Fixed incorrect signature comment · 0d9ed679
      unknown authored
      0d9ed679
    • unknown's avatar
      Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb · 57cea8f6
      unknown authored
      into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
      
      
      storage/ndb/src/ndbapi/Ndb.cpp:
        Using local, will merge manually.
      storage/ndb/include/ndbapi/Ndb.hpp:
        Changed parameter name to better reflect meaning.
      57cea8f6
    • unknown's avatar
      DictCache.hpp, Ndb.hpp: · 1486a5a7
      unknown authored
        Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
      ndb_restore.result, ndb_restore.test:
        Changed test to use information_schema to check auto_increment
      DictCache.cpp, Ndb.cpp:
        Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node. When setting the auto_increment value we'll also read up the new value, this is useful if we use the table the first time in this MySQL Server and haven't yet seen the NEXTID value. The kernel will avoid updating since it already has the value but will also read up the NEXTID value to ensure we don't need to do this any more time.
      ndb_auto_increment.result:
        Updated result file since it was incorrect
      
      
      ndb/include/ndbapi/Ndb.hpp:
        Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
      ndb/src/ndbapi/DictCache.hpp:
        Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
      ndb/src/ndbapi/DictCache.cpp:
        Add new variable m_highest_seen when only peeking at auto_increment NEXTID
        and not retrieving to cache. Add new method to check tupleId before calling
        data node. When setting the auto_increment value we'll also read up the new
        value, this is useful if we use the table the first time in this MySQL Server
        and haven't yet seen the NEXTID value. The kernel will avoid updating since it
        already has the value but will also read up the NEXTID value to ensure we
        don't need to do this any more time.
      ndb/src/ndbapi/Ndb.cpp:
        Add new variable m_highest_seen when only peeking at auto_increment NEXTID
        and not retrieving to cache. Add new method to check tupleId before calling
        data node. When setting the auto_increment value we'll also read up the new
        value, this is useful if we use the table the first time in this MySQL Server
        and haven't yet seen the NEXTID value. The kernel will avoid updating since
        it already has the value but will also read up the NEXTID value to ensure we
        don't need to do this any more time.
      mysql-test/r/ndb_restore.result:
        Changed test to use information_schema to check auto_increment
      mysql-test/t/ndb_restore.test:
        Changed test to use information_schema to check auto_increment
      mysql-test/r/ndb_auto_increment.result:
        Updated result file since it was incorrect
      1486a5a7