1. 06 Oct, 2004 2 commits
    • unknown's avatar
      debug printout · f65a89af
      unknown authored
      f65a89af
    • unknown's avatar
      bug#5367 · 0221e75c
      unknown authored
      subqueries with "not in" and ndb
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        1) Fix handling of LQHKEYREF & IgnoreError & Index read
        2) Fix TCRELEASEREQ = ok if CS_ABORTING & AS_IDLE
        3) Give more info back in case of TCRELEASEREF
      sql/ha_ndbcluster.cc:
        Rewrite index_read to give proper error codes back
      0221e75c
  2. 05 Oct, 2004 9 commits
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · b29e9496
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      b29e9496
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · b98807ec
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      b98807ec
    • unknown's avatar
      e0274db3
    • unknown's avatar
      wl2135 - index restart · 7a8336be
      unknown authored
      
      mysql-test/r/ndb_index_ordered.result:
        test case
      mysql-test/t/ndb_index_ordered.test:
        test case
      ndb/include/kernel/signaldata/ScanTab.hpp:
        Split exclusive/keyinfo
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        Add possibility retreive sorted flag
      ndb/include/ndbapi/NdbOperation.hpp:
        Add possibility retreive lock mode
      ndb/include/ndbapi/NdbResultSet.hpp:
        Add possibility to get operation
      ndb/src/common/debugger/signaldata/ScanTab.cpp:
        Split exclusive/keyinfo
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Store flags in ScanFragReq::requestInfo format
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Store flags in ScanFragReq::requestInfo format
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        Keep theLockMode up-to-date
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Keep theLockMode up-to-date
      sql/ha_ndbcluster.cc:
        Use NdbIndexScanOperation::reset_bounds when
          performing second index access
      7a8336be
    • unknown's avatar
      moved code out of DBUG_ASSERT · ab5c7a9e
      unknown authored
      ab5c7a9e
    • unknown's avatar
      last try didnt work · 2f321291
      unknown authored
      2f321291
    • unknown's avatar
      wl2135 test prg + bug fixes · 7cf1c4d5
      unknown authored
      
      ndb/include/ndbapi/NdbConnection.hpp:
        Add support for removing op from list
      ndb/include/ndbapi/NdbScanOperation.hpp:
        virtual destructor
      ndb/src/ndbapi/NdbConnection.cpp:
        Add support for removing op from list
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Set magic number to invalid before first prepareSendScan
        (so that prepareSendScan is only called once incase of restarts)
      ndb/src/ndbapi/Ndblist.cpp:
        Use correct type
      ndb/test/src/UtilTransactions.cpp:
        Update test prg.
        - use LM_Read to maintain locks
        - set iop = null on temporary error (restart transaction)
      7cf1c4d5
    • unknown's avatar
      bumped up version to 3.5.2 · 9d2c186c
      unknown authored
      removed staus flag
      
      
      9d2c186c
  3. 04 Oct, 2004 29 commits
    • unknown's avatar
      lock0lock.c: · ef40ba04
      unknown authored
        Fix compiler warning
      
      
      innobase/lock/lock0lock.c:
        Fix compiler warning
      ef40ba04
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d36e6019
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-ryan
      
      
      d36e6019
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · f4bd4e60
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      f4bd4e60
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5b47c974
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-ryan
      
      
      5b47c974
    • unknown's avatar
      wl2135 - ndb api test prg · e8b47674
      unknown authored
      
      ndb/test/include/NDBT_ResultRow.hpp:
        Completely new verifyOrderedIndex
           which utilies new wl2135 functionality
        + more utility functions
      ndb/test/include/UtilTransactions.hpp:
        Completely new verifyOrderedIndex
           which utilies new wl2135 functionality
        + more utility functions
      ndb/test/src/NDBT_ResultRow.cpp:
        Completely new verifyOrderedIndex
           which utilies new wl2135 functionality
        + more utility functions
      ndb/test/src/UtilTransactions.cpp:
        Completely new verifyOrderedIndex
           which utilies new wl2135 functionality
        + more utility functions
      e8b47674
    • unknown's avatar
      ae14bc77
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · f9900675
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      f9900675
    • unknown's avatar
      corrected merge error rgarding NDB_CONNECTSTRING · 0afb328e
      unknown authored
      0afb328e
    • unknown's avatar
      added debug printouts in ndbapi · 1c0213eb
      unknown authored
      1c0213eb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6ed4888c
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-ryan
      
      
      6ed4888c
    • unknown's avatar
      Made TIMESTAMP NULL columns without explicit DEFAULT value to be always · 76c9e10e
      unknown authored
      treated as DEFAULT NULL columns (independently from their position in
      table).
      
      (still to be discussed with Monty, Brian, Trudy et al. before push)
      
      
      mysql-test/r/type_timestamp.result:
        Update test after making TIMESTAMP NULL columns without explicit 
        DEFAULT value to be always treated as DEFAULT NULL columns 
        (independently from their position in table).
      mysql-test/t/type_timestamp.test:
        Update test after making TIMESTAMP NULL columns without explicit 
        DEFAULT value to be always treated as DEFAULT NULL columns 
        (independently from their position in table).
      sql/sql_parse.cc:
        add_field_to_list(): made TIMESTAMP NULL columns without explicit 
        DEFAULT value to be always treated as DEFAULT NULL columns (independently
        from their position in table). This also simplifies code a bit.
      76c9e10e
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 8f9e1eb5
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      8f9e1eb5
    • unknown's avatar
      typo · 4d288838
      unknown authored
      4d288838
    • unknown's avatar
      Merge · 035d92f4
      unknown authored
      
      sql/sql_show.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        SCCS merged
      035d92f4
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ab600d16
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      ab600d16
    • unknown's avatar
      bug #5872, transactions should only be restarted with transaction.on flag off... · 5e458aac
      unknown authored
      bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed
      added testcase for this
      use force send for all executes
      
      
      mysql-test/r/ndb_blob.result:
        added testcase for alter table of blob from ndb to myisam
      mysql-test/t/ndb_blob.test:
        added testcase for alter table of blob from ndb to myisam
      sql/ha_ndbcluster.cc:
        bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed
        use force send for all executes
      5e458aac
    • unknown's avatar
    • unknown's avatar
      new printer · 900182d5
      unknown authored
      900182d5
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · d7885b5e
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      ndb/include/ndbapi/NdbOperation.hpp:
        Auto merged
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Auto merged
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        Auto merged
      d7885b5e
    • unknown's avatar
      NdbIndexScanOperation::reset_bounds() · 499ebf4d
      unknown authored
      - Send BOUNDS as KEYINFO
      - At restart, only reset KEYINFO
      
      --
      Fix resource shortage at KEYINFO in Dbtc and Dblqh w.r.t scan
      --
      
      
      ndb/include/kernel/signaldata/AttrInfo.hpp:
        Let NdbScanOperation access AttrInfo
      ndb/include/kernel/signaldata/KeyInfo.hpp:
        Let NdbScanOperation access AttrInfo
      ndb/include/kernel/signaldata/ScanFrag.hpp:
        Send KeyLen in ScanFragReq (for range scans)
      ndb/include/kernel/signaldata/ScanTab.hpp:
        Send KeyLen in ScanTabReq (for range scans)
      ndb/include/ndbapi/NdbConnection.hpp:
        Function for adding op to list
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        new method for saving BOUNDS
      ndb/include/ndbapi/NdbOperation.hpp:
        Remove bounds stuff from NdbOperation and put it into NdbScanOperation
      ndb/include/ndbapi/NdbScanOperation.hpp:
        reset bounds
      ndb/src/common/debugger/signaldata/Makefile.am:
        New signal data printer for ScanFrag
      ndb/src/common/debugger/signaldata/ScanTab.cpp:
        Fix printout
      ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
        New signal data printer for ScanFrag
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Updated ScanFragReq
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Use same sendKeyInfo for both acckeyreq and tux_bounds
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Let range scan use KEYinfo for bounds instead of attrinfo
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Let range scan use KEYinfo for bounds instead of attrinfo
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Handle keyinfo in range scan
      ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        Skip useless 5 words in beginning of TuxBounds
      ndb/src/kernel/blocks/suma/Suma.cpp:
        Fix SCAN_FRAGREQ
      ndb/src/ndbapi/NdbConnection.cpp:
        reset bounds
      ndb/src/ndbapi/NdbOperation.cpp:
        Remove bounds
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        Remove bounds stuff
      ndb/src/ndbapi/NdbOperationInt.cpp:
        Remove bounds stuff
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Send BOUNDS in KEYINFO instead of ATTRINFO
      499ebf4d
    • unknown's avatar
      A couple of typos fixed. · 48bf8259
      unknown authored
      
      sql/item.cc:
        A typo fixed in a comment, which is probably not valid any more
      sql/sql_class.h:
        no such class Ttem_subselect.
      48bf8259
    • unknown's avatar
      To allow compilation on Tru64, the MySQL code should not mess · 1d060ec0
      unknown authored
      with the system-reserved (and system-defined) '_REENTRANT' 
      CPP identifier.
      Especially, it must not be "undefine"d, because the Tru64 compiler
      needs it if threads are enabled.
      
      
      include/my_pthread.h:
        On Tru64, '_REENTRANT' is set by the compiler when the "-pthread" 
        option is given, and it must be set when the system's 'pthread.h' is 
        included (or else a '#error' is activated).
        So it must not be undef'ed, and it should not be def'ed either, as it
        is a system-reserved CPP identifier with which we should not mess
        anyway - it is risky to use it!
        Build on all platforms was checked privately, change caused no errors!
      1d060ec0
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 599a7842
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      599a7842
    • unknown's avatar
      addes auto pointer class for using with my_ functions · 77fd668e
      unknown authored
      switch to using my_ for heap allocations
      
      
      ndb/include/util/NdbAutoPtr.hpp:
        addes auto pointer class for using with my_ functions
      ndb/src/mgmclient/CommandInterpreter.cpp:
        switch to using my_ for heap allocations
      77fd668e
    • unknown's avatar
      sql_show.cc: · b3b26c05
      unknown authored
        ctype_recode does not hang anymore. Small fix after Marko's change.
      
      
      sql/sql_show.cc:
        ctype_recode does not hang anymore. Small fix after Marko's change.
      b3b26c05
    • unknown's avatar
      Merge · 15d474b2
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        SCCS merged
      15d474b2
    • unknown's avatar
      use new function stop_ndbcluster · 9752b315
      unknown authored
      9752b315
    • unknown's avatar
      Merge · de3a7d11
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        SCCS merged
      de3a7d11
    • unknown's avatar
      2ed312ce