1. 26 Sep, 2004 4 commits
    • unknown's avatar
      Merge · 1dd76e19
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      mysql-test/mysql-test-run.sh:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        SCCS merged
      1dd76e19
    • unknown's avatar
      WL#1424 Updated after review · 5077ba47
      unknown authored
      * Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
      * Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find. 
      
      
      mysql-test/t/ndb_autodiscover.test:
        Added a new test case, disabled for now, waiting for mysql-test-run to set a NDB_CONNECTSTRING
      sql/ha_ndbcluster.cc:
        Rewrite of ndbcluster_find_files to remove and delete files using only one mutex lock. 
        This version only discover files that fulfill wildcard.
      sql/ha_ndbcluster.h:
        Add list of files as parameter
      sql/handler.cc:
        Add list of files as parameter
      sql/handler.h:
        Add list of files as parameter
      sql/sql_show.cc:
        Moving the ha_find_files to end of function, so that the file lista can be passsed to it.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      5077ba47
    • unknown's avatar
      testBasic -n MassiveRollback · a64953ed
      unknown authored
      Make sure to not receive more that buffer can fit currently
      
      
      ndb/src/common/transporter/TCP_Transporter.cpp:
        Make sure to not receive more that buffer can fit currently
      a64953ed
    • unknown's avatar
      testDict -n InvalidTables · 2de9ef17
      unknown authored
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Add more require's in VM_TRACE
        Fix release of invalid tables
        testDict -n InvalidTables
      2de9ef17
  2. 25 Sep, 2004 13 commits
    • unknown's avatar
      testBackup · 0ef58d54
      unknown authored
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Fix so that start backup can be blocking
      ndb/test/run-test/daily-devel-tests.txt:
        Use atrt-testBackup (which setups env)
      0ef58d54
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · efb4d837
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      efb4d837
    • unknown's avatar
      local config now outside config retriever · 01eca8f8
      unknown authored
      01eca8f8
    • unknown's avatar
      Ops forgott to put table in hash · ea29015d
      unknown authored
      ea29015d
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 69edf1dd
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      69edf1dd
    • unknown's avatar
      corrected small :) mistake · 45a7efa3
      unknown authored
      45a7efa3
    • unknown's avatar
      added printout for where configuration is fetched · 7a2cb204
      unknown authored
      debug printouts
      
      
      mysql-test/ndb/ndbcluster.sh:
        .
      ndb/include/mgmcommon/ConfigRetriever.hpp:
        added printout for where configuration is fetched
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        added printout for where configuration is fetched
      ndb/src/kernel/main.cpp:
        added printout for where configuration is fetched
      ndb/src/kernel/vm/Configuration.cpp:
        added printout for where configuration is fetched
      ndb/src/kernel/vm/Configuration.hpp:
        added printout for where configuration is fetched
      ndb/src/ndbapi/Ndb.cpp:
        debug printouts
      7a2cb204
    • unknown's avatar
      bug#5702 · 339d362d
      unknown authored
      more bug fixes.
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        DropIndex -
        1) return Invalid version 
        2) Mark as IS_DROPPING so that 2 simulatainious threads can't drop it
      ndb/src/ndbapi/NdbDictionary.cpp:
        Changed listIndex from taking table name to taking table id
        (should be index version aswell)
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        List indexes using id
        Fix log towards m_globalHash
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        List indexes using tableid (indexid)
      339d362d
    • unknown's avatar
      moved LocalConfig out of config retriver · 1bf19b82
      unknown authored
      1bf19b82
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 8a9cb1af
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      8a9cb1af
    • unknown's avatar
      added debug printouts · ae86dad2
      unknown authored
      ae86dad2
    • unknown's avatar
      Init theSCAN_TABREQ · 2d4abfca
      unknown authored
      2d4abfca
    • unknown's avatar
      Fix memory leak · 892b5c9b
      unknown authored
      
      BitKeeper/deleted/.del-NdbScanReceiver.hpp~5c295814a47e7bb4:
        Delete: ndb/src/ndbapi/NdbScanReceiver.hpp
      BitKeeper/deleted/.del-NdbScanReceiver.cpp~b8a7472e4a7c424f:
        Delete: ndb/src/ndbapi/NdbScanReceiver.cpp
      ndb/include/ndb_global.h:
        Added ndb_end (corresponding to ndb_init)
      ndb/src/common/util/ndb_init.c:
        Added ndb_end (corresponding to ndb_init)
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Release SCAN_TABREQ and 
        make sure to call NdbOperation::release (that releases other stuff)
      ndb/src/ndbapi/Ndbinit.cpp:
        Reorder free-ing so that signal are release last
        (so that operations holding signals can release the first)
      892b5c9b
  3. 24 Sep, 2004 8 commits
    • unknown's avatar
      fix for invalidating table if mismatch with frm · d6c1a39a
      unknown authored
          removed debug printout
          new test in alter table for dictionay update test with multiple connections
          added coice of setting MaxNoOfOrderedIndexes
          added option to run "--small-bench"
      
      
      mysql-test/mysql-test-run.sh:
        added option to run "--small-bench"
      mysql-test/ndb/ndb_config_2_node.ini:
        added coice of setting MaxNoOfOrderedIndexes
      mysql-test/ndb/ndbcluster.sh:
        added coice of setting MaxNoOfOrderedIndexes
      mysql-test/r/ndb_alter_table.result:
        new test in alter table for dictionay update test with multiple connections
      mysql-test/t/ndb_alter_table.test:
        new test in alter table for dictionay update test with multiple connections
      ndb/src/ndbapi/DictCache.cpp:
        removed debug printout
      sql/ha_ndbcluster.cc:
        fix for invalidating table if mismatch with frm
      d6c1a39a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 5ef32b58
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      5ef32b58
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · f90828cb
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      f90828cb
    • unknown's avatar
      Extra jam broken if · 99a020db
      unknown authored
      99a020db
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6876d28c
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      6876d28c
    • unknown's avatar
      Dbdict · 2917d9fd
      unknown authored
      - set table state in releaseTableObject
      - make handleTabInfoInit release object if parsing fails
      - make sure table is not accessed is parsing fails
      
      
      2917d9fd
    • unknown's avatar
      bug, releaseTableObject called twice · a366d6ee
      unknown authored
      bug, whole bucket removed if delete first element in bucket
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        bug, releaseTableObject called twice
      ndb/src/ndbapi/NdbLinHash.hpp:
        bug, whole bucket removed if delete first element in bucket
      a366d6ee
    • unknown's avatar
      logging_ok: · c9a03e17
      unknown authored
        Logging to logging@openlogging.org accepted
      sql_show.cc, type_enum.test, type_enum.result:
        Bug #5628 German characters in field-defs will be '?' with some table definitions
      
      
      mysql-test/r/type_enum.result:
        Bug #5628 German characters in field-defs will be '?' with some table definitions
      mysql-test/t/type_enum.test:
        Bug #5628 German characters in field-defs will be '?' with some table definitions
      sql/sql_show.cc:
        Bug #5628 German characters in field-defs will be '?' with some table definitions
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      c9a03e17
  4. 23 Sep, 2004 9 commits
    • unknown's avatar
      f2821fa1
    • unknown's avatar
      A fix and test case for bug#5688 "Upgraded 4.1.5 Server seg faults" · edcccfbc
      unknown authored
      
      mysql-test/r/ps.result:
        Test results fixed: the test case for bug#5688 "Upgraded 4.1.5 Server 
        seg faults"
      mysql-test/t/ps.test:
        Test case for bug#5688 "Upgraded 4.1.5 Server seg faults"
      sql/item_cmpfunc.cc:
        A fix for bug#5688 "Upgraded 4.1.5 Server seg faults":
        fix just another place where we use wrong memory root for an Item
        in statement prepare.
        In addition, make the check for charsets in Item_bool_func2
        more generic (fixes the test case when we use LIKE to compare BLOBs
        with TEXT data).
      edcccfbc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3f76fd69
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-memroot
      
      
      3f76fd69
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · fd5e254d
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.5371
      
      
      fd5e254d
    • unknown's avatar
      Fix for BUG#5705: "SET CHARATER_SET_SERVERetc will be lost if STOP SLAVE before following query": · b76d3b4f
      unknown authored
      we do not increment rli->group_master_log_pos if we are just after a SET ONE_SHOT (it's not a standalone event)
      
      
      mysql-test/r/rpl_charset.result:
        testing interruption of slave SQL thread between SET CHARACTER_SET_SERVER... and the companion INSERT.
      mysql-test/t/rpl_charset.test:
        testing interruption of slave SQL thread between SET CHARACTER_SET_SERVER... and the companion INSERT.
      sql/log_event.cc:
        we do not increment rli->group_master_log_pos if we are just after a SET
        ONE_SHOT, because SET ONE_SHOT should not be separated from its following
        updating query.
      b76d3b4f
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · abe4cd0e
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.5371
      
      
      abe4cd0e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 412a052a
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-memroot
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      412a052a
    • unknown's avatar
      Implementation of Monty's idea about clear_alloc_root() optimization and cleanup of work · 7ba5d931
      unknown authored
      with memory roots in THD/Statement/Item_arena.
      Added assertions preventing memory allocation on bzero'ed MEM_ROOT since it is worked by 
      pure luck and was very ineffective.
      
      
      include/my_sys.h:
        Reimplementation of Monty's optimization of clear_alloc_root().
        Now clear_alloc_root() can be used only for detaching memory associated with MEM_ROOT
        (e.g. to avoid its freeing). It can not be used for MEM_ROOT initialization any longer 
        (it was bad idea anyway since memory allocation on such MEM_ROOT was very ineffective 
        and worked by pure luck).
        Introduced ALLOC_ROOT_MIN_BLOCK_SIZE constant.
      mysys/my_alloc.c:
        Added description of init_alloc_root().
        Added assertions to alloc_root() and reset_root_defaults() so now they can only be used
        on previosly initialized MEM_ROOT. (It worked for bzeroed MEM_ROOT before but 
        by pure luck and very inefficiently). Calling free_root() on bzero'ed MEM_ROOT
        is still ok (we can't remove this easily because of static MEM_ROOTs).
        Also now using ALLOC_ROOT_MIN_BLOCK_SIZE constant inside these functions.
      sql/opt_range.cc:
        Fixed get_quick_select_for_ref() function to not use bzero'ed MEM_ROOT for allocation.
        Also QUICK_RANGEs created in this function should be created in memory root of QUICK_SELECT.
      sql/sql_class.cc:
        Implementation of Monty's idea about clear_alloc_root() optimization and cleanup of work 
        with memory roots in THD/Statement/Item_arena.
        Now we are always initing THD::transaction.mem_root and THD::mem_root in THD constructor 
        (without memory allocation and with minimal block size) and then later change their
        parameters in THD::init_for_queries() (this is partially because we can't allocate anything
        on bzero'ed memory roots anymore).
        Item_arena() constructor is now trivial and is used only then Item_arena is created as backup
        storage for other Item_arena (we use Item_arena(bool) now if it is part of Statement).
        Both trivial Item_arena constructor and destructor are now inline.
        Removed unneeded clear_alloc_root from Item_arena::restore_backup_item_arena().
      sql/sql_class.h:
        Both trivial Item_arena constructor and destructor are now inline.
        Commented various Item_arena constructors.
      7ba5d931
    • unknown's avatar
      bug#5702 · 8090516c
      unknown authored
      Check index version already in master
      to prevent "non-atmoic" failing drop index
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Check index version already in master
        to prevent "non-atmoic" failing drop index
      8090516c
  5. 22 Sep, 2004 6 commits
    • unknown's avatar
      debug printout · 99e809cb
      unknown authored
      99e809cb
    • unknown's avatar
      Additional fix for bug #5136 (Geometry object is corrupted when queried) · 126ea49d
      unknown authored
      CREATE TABLE t1 SELECT POINT(1,2); fixed
      
      
      mysql-test/r/gis.result:
        Appropriate test result
      mysql-test/t/gis.test:
        test case
      sql/item_geofunc.cc:
        Item_geometry_func::fix_lengths_and_dec implementation
        several fix_length_and_dec's not needed now
      sql/item_geofunc.h:
        Item_geometry_func class presented
      126ea49d
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 4fb031af
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      4fb031af
    • unknown's avatar
      A fix and test case for Bug#5315 "mysql_change_user() doesn't free · ccf52b4f
      unknown authored
      prepared statements."
      
      
      include/hash.h:
        New declaration for hash_reset() function. The old version was not used.
      libmysql/client_settings.h:
        Declaration for mysql_detach_stmt_list().
      libmysql/libmysql.c:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        add call to mysql_detach_stmt_list(prepared statements) to
        mysql_change_user(): all statements are freed by server, so client
        counterparts need to be marked as not usable.
      mysys/hash.c:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        implementation of hash_reset(), which frees all hash elements
        and prepares the hash for reuse.
      sql-common/client.c:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        implementation of mysql_detach_stmt_list(): zero connection pointer
        in given statement list, thus marking given statements as not usable.
      sql/sql_class.cc:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        reset prepared statements map in THD::change_user().
      sql/sql_class.h:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        implementation of Statement_map::reset().
        A little cleanup of ~Statement_map(): first empty names_hash, as st_hash
        has a free function, which will delete statements.
      tests/client_test.c:
        A test case for bug #5315 "mysql_change_user() doesn't free prepared
        statements".
      ccf52b4f
    • unknown's avatar
      Fix so that testBackup wait until start has finished before · 22db858b
      unknown authored
      starting to restore
      
      
      22db858b
    • unknown's avatar
      testScan - ReadWithLocksAndInserts · 71ead013
      unknown authored
      testBasic LocksAndInserts
      
      
      ndb/test/src/HugoTransactions.cpp:
        Fix HugoTransaction::load so that transaction is closed and started if
        error is found
      71ead013