1. 11 Feb, 2005 2 commits
    • unknown's avatar
      return NDB_INVALID_SOCKET instead of -1 for Windows compatibility. · 85ee8a18
      unknown authored
      (Found in review by Tomas Ulin)
      
      
      85ee8a18
    • unknown's avatar
      WL2278 Dynamic ports - Impl 6, "deal with mgm server restart and multiple mgm servers" · 6bd9c85a
      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
      6bd9c85a
  2. 10 Feb, 2005 34 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 6eae64dd
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      6eae64dd
    • unknown's avatar
      added more debug trace · 2acf4014
      unknown authored
          + removed double check for invalid socket
      
      
      ndb/src/common/transporter/Transporter.cpp:
        added more debug trace
        + removed double check for invalid socket
      ndb/src/ndbapi/Ndb.cpp:
        added more debug trace
      2acf4014
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 4eb1c684
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      4eb1c684
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 527c2d74
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      ndb/test/run-test/daily-devel-tests.txt:
        Auto merged
      527c2d74
    • unknown's avatar
      ndb - add more tests to autotest · d4574b91
      unknown authored
      
      ndb/test/run-test/daily-basic-tests.txt:
        run mysql-test-run for max 1 hour
          (normally 30 minutes)
      ndb/test/run-test/daily-devel-tests.txt:
        Add benchmark to devel suite
      ndb/test/run-test/main.cpp:
        Add bench mode. always produce report
      ndb/test/run-test/run-test.hpp:
        Add bench mode. always produce report
      d4574b91
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · d8c74a9c
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      d8c74a9c
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · ed74e8f9
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ed74e8f9
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 62fc28f4
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      62fc28f4
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 13ca00ee
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      13ca00ee
    • unknown's avatar
      ndb - adapt old testprg to changes in ndbapi · 86b0dc16
      unknown authored
      
      ndb/test/ndbapi/bench/userInterface.h:
        adapt to changes in ndbapi
      86b0dc16
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 93195380
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      93195380
    • unknown's avatar
      Merge mysql.com:/home/kostja/work/mysql-4.1-root · 6cdda5b3
      unknown authored
      into mysql.com:/home/kostja/work/mysql-5.0-root
      
      
      libmysql/libmysql.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      6cdda5b3
    • unknown's avatar
      Follow-up for bug#7990 · d9039e87
      unknown authored
      
      libmysql/libmysql.c:
        And now put it to the proper place and make it work (Bug#7990)
      tests/mysql_client_test.c:
        Enable the test for bug#7990
      d9039e87
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · fc75a836
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      ndb/src/kernel/vm/FastScheduler.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      fc75a836
    • unknown's avatar
      merge · 8da1c3e0
      unknown authored
      8da1c3e0
    • unknown's avatar
      daily-basic-tests.txt: · 9af6c3a2
      unknown authored
        increased timeout as it is exceeded every now and then giving erroneous indication on error
      
      
      ndb/test/run-test/daily-basic-tests.txt:
        increased timeout as it is exceeded every now and then giving erroneous indication on error
      9af6c3a2
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · e511acba
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      e511acba
    • unknown's avatar
      Merge mysql.com:/home/kostja/work/mysql-4.1-root · 98bc2348
      unknown authored
      into mysql.com:/home/kostja/work/mysql-5.0-root
      
      
      libmysql/libmysql.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      98bc2348
    • unknown's avatar
      Fix -ansi -pedantic compilation failure. · bebba958
      unknown authored
      bebba958
    • unknown's avatar
      A fix and test case for Bug#7990 "mysql_stmt_close doesn't · a26ce94f
      unknown authored
      reset mysql->net.last_error": the solution is to clear
      MYSQL->net error before performing COM_CLOSE: if the call
      succeeds, the connection is usable for other statements.
      More comprehensive fix is to clear MYSQL->net for all
      recoverable errors at the time they happen, it will be
      implemented in 5.0 as it introduces incompatibility in behavior.
      
      
      libmysql/libmysql.c:
        A simple fix for Bug#7990 "mysql_stmt_close doesn't reset 
        mysql->net.last_error"
      tests/mysql_client_test.c:
        A test case for Bug#7990 " mysql_stmt_close doesn't reset 
        mysql->net.last_error"
      a26ce94f
    • unknown's avatar
      adopted test scripts · b0af47bc
      unknown authored
      
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        added debug printouts
      ndb/test/ndbapi/testDict.cpp:
        updated FragmentType tests, removed failing "equal" on the tables since they will not be equal because fragmentation is updated from the kernel
      ndb/test/run-test/16node-tests.txt:
        adopted test scripts to new Fragment test name
      ndb/test/run-test/basic.txt:
        adopted test scripts to new Fragment test name
      ndb/test/run-test/daily-basic-tests.txt:
        adopted test scripts to new Fragment test name
      b0af47bc
    • unknown's avatar
      manual merge · c7674f14
      unknown authored
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      c7674f14
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 77b2435e
      unknown authored
      into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      77b2435e
    • unknown's avatar
      Things missing in last changset · 4adab48b
      unknown authored
      After merge fixes
      Don't give duplicate warnings for some ::store() functions
      
      
      mysql-test/mysql-test-run.sh:
        Added back missing line
      mysql-test/r/ps_2myisam.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_3innodb.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_4heap.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_5merge.result:
        Update results after removing duplicate warnings from ::store()
      sql/field.cc:
        Don't give duplicate warnings for some ::store() functions
        Before we could get different number of warnings in the test suite for different platforms
      sql/field.h:
        Update results after removing duplicate warnings from ::store()
      sql/sql_class.h:
        Update results after removing duplicate warnings from ::store()
      sql/sql_error.cc:
        Update results after removing duplicate warnings from ::store()
      sql/sql_list.h:
        After merge fix
      4adab48b
    • unknown's avatar
      Change script to avoiud multiple --debug flags when starting master servers · 6e021edc
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Use local var for the individulisation of tracefile name
      6e021edc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2d435c8a
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      2d435c8a
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6ec04a6a
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      6ec04a6a
    • unknown's avatar
      A fix and test case for Bug#8330 "mysql_stmt_execute crashes" (libmysql). · fca90750
      unknown authored
      
      libmysql/libmysql.c:
        Fix for bug#8330 "mysql_stmt_execute crashes": we need to bail out
        from mysql_stmt_execute if mysql->net is occupied with a result set of
        another statement. Otherwise on the next attempt to use net we get
        a crash, as it's freed in case of error.
      tests/mysql_client_test.c:
        A test case for Bug#8330 "mysql_stmt_execute craches" (libmysql)
      fca90750
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-rel · f39ca758
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      f39ca758
    • unknown's avatar
      Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc. · 7684e100
      unknown authored
      
      sql/sql_parse.cc:
        Added missing #ifdef HAVE_INNOBASE_DB:s.
      7684e100
    • unknown's avatar
      ndb - Reenable old benchmark · cf581609
      unknown authored
      
      ndb/test/ndbapi/Makefile.am:
        Reenable old benchmark
      cf581609
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · b3d84a68
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      b3d84a68
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-zlib · 425f2f91
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      425f2f91
    • unknown's avatar
      Merge with 4.1 · 9f04f9d0
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysqltest.c:
        Auto merged
      extra/my_print_defaults.c:
        Auto merged
      extra/perror.c:
        Auto merged
      extra/resolve_stack_dump.c:
        Auto merged
      include/help_end.h:
        Auto merged
      include/help_start.h:
        Auto merged
      myisam/myisamlog.c:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/heap_hash.result:
        Auto merged
      BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      ndb/src/kernel/vm/FastScheduler.cpp:
        Auto merged
      netware/mysql_test_run.c:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      netware/BUILD/nwbootstrap:
        merge: keep local
      scripts/make_binary_distribution.sh:
        merge: keep local
      sql/ha_heap.cc:
        Trivial merge
      sql/ha_innodb.cc:
        Auto merge (Code already existed in 5.0)
      sql/item_cmpfunc.cc:
        Simple merge
      sql/item_func.cc:
        Simple merge
      sql/item_row.cc:
        Simple merge
      sql/item_strfunc.cc:
        Simple merge
      sql/item_subselect.cc:
        Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
      9f04f9d0
  3. 09 Feb, 2005 4 commits