1. 14 Feb, 2005 6 commits
  2. 12 Feb, 2005 7 commits
  3. 11 Feb, 2005 23 commits
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 35e24fcb
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      35e24fcb
    • unknown's avatar
      Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 · 7d69e469
      unknown authored
      
      Build-tools/Do-compile:
        Auto merged
      7d69e469
    • unknown's avatar
      After merge fix. · 2c9ea337
      unknown authored
      2c9ea337
    • unknown's avatar
      Merge · 7e170531
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/triggers/post-commit:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/table.cc:
        SCCS merged
      7e170531
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · c98f2bfc
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-bug8306
      
      c98f2bfc
    • unknown's avatar
      Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1 · 79d39787
      unknown authored
      
      Build-tools/Do-compile:
        Auto merged
      79d39787
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 0988260d
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      extra/replace.c:
        Auto merged
      0988260d
    • unknown's avatar
      select.result: · ae3216ef
      unknown authored
        Adjusted results of the test case for bug #7520 for 4.1.
      
      
      mysql-test/r/select.result:
        Adjusted results of the test case for bug #7520 for 4.1.
      ae3216ef
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 2eef623a
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      2eef623a
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 22e17851
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      22e17851
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 10d9b90c
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      10d9b90c
    • unknown's avatar
      ndb - fix compiler warning (error using gcc-3.4.3) · 0d2f8a29
      unknown authored
      
      ndb/test/ndbapi/bench/mainPopulate.cpp:
        compiler warning (error using gcc-3.4.3)
      0d2f8a29
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · a009cd4d
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
      
      a009cd4d
    • unknown's avatar
      return NDB_INVALID_SOCKET instead of -1 for Windows compatibility. · 23afe307
      unknown authored
      (Found in review by Tomas Ulin)
      
      23afe307
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0 · 77890702
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      extra/replace.c:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/table.cc:
        Auto merged
      77890702
    • unknown's avatar
      select.result, select.test: · 0ba0d09a
      unknown authored
        Added a test case for bug #7520.
      table.cc:
        Fixed bug #7520.
        The bug was caused by a wrong calculation of the field max_key_length for
        a TABLE structure when there was an index on a blob field.
      
      
      sql/table.cc:
        Fixed bug #7520.
        The bug was caused by a wrong calculation of the field max_key_length for
        a TABLE structure when there was an index on a blob field.
      mysql-test/t/select.test:
        Added a test case for bug #7520.
      mysql-test/r/select.result:
        Added a test case for bug #7520.
      0ba0d09a
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 1628141f
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      1628141f
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0fc3171f
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      0fc3171f
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · bc8bf4a3
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/triggers/post-commit:
        Auto merged
      ndb/test/run-test/daily-devel-tests.txt:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      bc8bf4a3
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · b6972fcc
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      b6972fcc
    • unknown's avatar
      ndb - old bench rescue · 42f603e3
      unknown authored
      
      ndb/test/ndbapi/bench/mainPopulate.cpp:
        return correct
      ndb/test/ndbapi/bench/userInterface.cpp:
        remove NA setting
      ndb/test/run-test/daily-devel-tests.txt:
        set correct args
      42f603e3
    • unknown's avatar
      WL2278 Dynamic ports - Impl 6, "deal with mgm server restart and multiple mgm servers" · 705898b4
      unknown authored
      - when connecting to a mgm server as a transporter, create a NdbMgmHandle
        - over this mgm handle, report the dynamic ports
        - then turn it into a transporter
      - this will re-report dynamic ports to mgmds when they restart (as we'll have to
      set up our transporter again). This will also report it to all mgmds (as we'll
      have transporters to all of them).
      
      
      ndb/include/mgmapi/mgmapi.h:
        Add ndb_mgm_convert_to_transporter
         - converts to a transporter connect
         - destroys the handle (without disconnecting)
         - returns socket
      ndb/include/transporter/TransporterRegistry.hpp:
        Add prototype for connect_ndb_mgmd
      ndb/include/util/SocketClient.hpp:
        Remove connect_without_auth
        
        Add get_port() and get_server_name()
      ndb/src/common/transporter/Transporter.cpp:
        use TransporterRegistry::connect_ndb_mgmd() to make the connection if isMgmConnection
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Impliment TransporterRegistry::connect_ndb_mgmd
        
        - takes a SocketClient and constructs a connectstring.
        - uses this connect string to make a NdbMgmHandle
        - send dynamic ports to this mgm server
        - transform into a transporter connect
        - return socket
      ndb/src/common/util/SocketClient.cpp:
        Remove connect_without_auth
      ndb/src/kernel/main.cpp:
        Don't relay dynamic ports. We now do this on transporter connect
      ndb/src/mgmapi/mgmapi.cpp:
        Impliment ndb_mgm_convert_to_transporter
        - converts the mgm connection into a transporter connection
        - destroys the handle
        - returns the socket that should now be used as a transporter
      705898b4
    • unknown's avatar
      Set of fixes requested by Kent in IRC. Tested (except the windows changes... · 12ee8324
      unknown authored
      Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks...
      
      
      VC++Files/tests/mysql_client_test.dsp:
        fix request by Kent
      sql/item.cc:
        fix requested by kent
      12ee8324
  4. 10 Feb, 2005 4 commits
    • unknown's avatar
      Merge commit trigger · e042d67c
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      extra/replace.c:
        Auto merged
      BitKeeper/triggers/post-commit:
        Merge changes
      e042d67c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0 · 836822c6
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.0-clean
      
      836822c6
    • unknown's avatar
    • unknown's avatar
      BUG#6749: If there is no current database, then nothing should be binlogged if · d57dbbab
      unknown authored
      binlog-do-db or binlog-ignore-db are in effect.   (In the future 5.1? 5.0? I think 
      each statement should be verified against the filtering criteria based on the database
      it *uses* and not the *current* one.  But, right now the *current* database is what 
      counts according to the semantics of the manual.)
      
      
      sql/log.cc:
        BUG#6749: If there is no current database, then nothing should be binlogged if
        binlog-do-db or binlog-ignore-db are in effect.   (In the future I think that each 
        statement should be verified against the filtering criteria based on the database
        it *uses* and not the *current* one.  But, right now the *current* database is what 
        counts according to the semantics of the manual.)
      d57dbbab