1. 23 Jun, 2006 1 commit
    • unknown's avatar
      BUG#20622: Fix one-byte buffer overrun in IM directory string handling. · 0f3cc95b
      unknown authored
      The problem was a call to convert_dirname() with a destination buffer
      that did not have room for the trailing slash added by that function.
      This could cause the instance manager to crash in some cases.
      
      
      mysys/mf_dirname.c:
        Clarify in comments that convert_dirname destination must be larger than
        source to accomodate a trailing slash.
      server-tools/instance-manager/instance_options.cc:
        Fix buffer overrun.
      0f3cc95b
  2. 14 Jun, 2006 5 commits
  3. 12 Jun, 2006 2 commits
  4. 08 Jun, 2006 2 commits
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 4a8c5085
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      4a8c5085
    • unknown's avatar
      Bug #20336 CLUSTERLOG commands have no effect · 96fe14dd
      unknown authored
      
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Bug #20336 CLUSTERLOG commands have no effect
        - with signal sender the clock issuing the command and the revceiver of the events are not the same
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Bug #20336 CLUSTERLOG commands have no effect
        - make sure to actually send the update to ndb nodes, and wait for the reply
      ndb/src/mgmsrv/Services.cpp:
        Bug #20336 CLUSTERLOG commands have no effect
        - make sure to compute max every time for log level
      96fe14dd
  5. 22 May, 2006 1 commit
  6. 16 May, 2006 6 commits
  7. 15 May, 2006 4 commits
    • unknown's avatar
      correction of merge · 326ebe4c
      unknown authored
      326ebe4c
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 84b8f111
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      ndb/src/ndbapi/DictCache.cpp:
        Auto merged
      ndb/src/ndbapi/DictCache.hpp:
        Auto merged
      ndb/src/ndbapi/TransporterFacade.hpp:
        Auto merged
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      ndb/include/ndbapi/ndb_cluster_connection.hpp:
        manual merge
      ndb/src/ndbapi/ClusterMgr.cpp:
        manual merge
      ndb/src/ndbapi/ClusterMgr.hpp:
        manual merge
      84b8f111
    • unknown's avatar
      Bug #16875 , correction of previous patch · e3996585
      unknown authored
      e3996585
    • unknown's avatar
      Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail · 37f940ce
      unknown authored
      - invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
      - add check for correct frm on external lock when table cache is found invalid
      
      
      ndb/include/ndbapi/ndb_cluster_connection.hpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      ndb/src/ndbapi/ClusterMgr.cpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      ndb/src/ndbapi/ClusterMgr.hpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      ndb/src/ndbapi/DictCache.cpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      ndb/src/ndbapi/DictCache.hpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      ndb/src/ndbapi/TransporterFacade.hpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      sql/ha_ndbcluster.cc:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      mysql-test/r/ndb_autodiscover3.result:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      mysql-test/t/ndb_autodiscover3.test:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
      37f940ce
  8. 12 May, 2006 14 commits
    • unknown's avatar
      Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes · 9ffa09be
      unknown authored
      replaced get_field(MEM_ROOT *mem, Field *field) with 
      get_field(MEM_ROOT *mem, Field *field, String *res).
      It allows to avoid strlen().
      
      
      mysql-test/r/information_schema.result:
        Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
        test case
      mysql-test/t/information_schema.test:
        Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
        test case
      9ffa09be
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7c5b7438
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      7c5b7438
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 81878d7a
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      81878d7a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 97b4446a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      97b4446a
    • unknown's avatar
      merge fixies BUG#10418 4.1 -> 5.0 · e52288b5
      unknown authored
      e52288b5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · a1a0efd3
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      a1a0efd3
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 5697820b
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      5697820b
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · c3516513
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      c3516513
    • unknown's avatar
      Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH · af797c16
      unknown authored
      
      mysql-test/r/information_schema.result:
        Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
        test case
      mysql-test/r/join.result:
        Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
        result fix
      mysql-test/t/information_schema.test:
        Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
        test case
      af797c16
    • unknown's avatar
      Correct spelling errors · f7d265a9
      unknown authored
      f7d265a9
    • unknown's avatar
      Merge mysql.com:/home/mysql-4.1-10418 · 98912fb9
      unknown authored
      into  mysql.com:/home/mysql-5.0-10418
      
      
      mysql-test/t/outfile.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      mysql-test/r/func_str.result:
        expect NULL rather than error if file given to load_file() doesn't exist
      mysql-test/r/outfile.result:
        expect NULL rather than error if file given to load_file() doesn't exist
      mysql-test/t/func_str.test:
        show that load_file() will return NULL rather than throw an error
        if file doesn't exist
      98912fb9
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my50-bug19709 · 42c47bcb
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      42c47bcb
    • unknown's avatar
      Bug#19709 rpl_tmporary fails on powermacg5 · acf18799
      unknown authored
       - Don't kill the active connection to the server, instead read 
         the connection id, switch connection and kill the first one from there.
      
      
      mysql-test/r/rpl_temporary.result:
        Update test result
      mysql-test/t/rpl_temporary.test:
        Don't kill our own connection to the server as the result code differs depending 
        on platform.
      acf18799
    • unknown's avatar
      Added a test case for bug #18940:in 5.0 the optimizer chose · 5c6d923f
      unknown authored
      a worse execution plan than in 4.1 for some queries.
      It happened due the fact that at some conditions the 
      optimizer always preferred range or full index scan access
      methods to lookup access methods even when the latter were much
      cheaper. 
      The problem was not observed in 4.1 for the reported query
      because the WHERE condition was not of a form that could
      cause the problem.
      Equality propagation introduced on 5.0 added an extra 
      predicate and changed the WHERE condition. The new condition
      provoked the optimizer to make a bad choice.
      
      The problem was fixed by the patch for bug 17379.
      
      
      mysql-test/r/select.result:
        Added a test case for bug #18940.
        The problem was fixed by the patch for bug 17379.
      mysql-test/t/select.test:
        Added a test case for bug #18940.
        The problem was fixed by the patch for bug 17379.
      5c6d923f
  9. 11 May, 2006 2 commits
  10. 10 May, 2006 3 commits