1. 15 Jul, 2005 16 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 435846b8
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      435846b8
    • unknown's avatar
      Merge · 51229d4b
      unknown authored
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      ndb/src/common/transporter/Transporter.hpp:
        Auto merged
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      ndb/include/transporter/TransporterRegistry.hpp:
        SCCS merged
      ndb/src/common/transporter/Transporter.cpp:
        SCCS merged
      51229d4b
    • unknown's avatar
      minor type fixes to prev patch · dbbd54e5
      unknown authored
      dbbd54e5
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release · 2a48132e
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      2a48132e
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-4.1-release · 130cd50d
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
      
      
      130cd50d
    • unknown's avatar
      BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener · d4679992
      unknown authored
            + added close of some fd's
            + debug prints
      
      
      d4679992
    • unknown's avatar
      Bug #11132, reverted bug-fix, it introduces another bug. Ndbd's may get the same nodeid · 9622c473
      unknown authored
      In 4.1 the connection to the management server _must_ stay, that is how we
      ensure that the nodeids are reserved correctly
      
      
      
      9622c473
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8a422a14
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg9565
      
      
      8a422a14
    • unknown's avatar
      Added test case for bug #9565 "Wrong locking in stored procedure if a · 32e157ec
      unknown authored
      sub-sequent procedure is called" which was fixed by the same patch
      as bug #9597 "read lock stays when querying view from stored procedure".
      
      
      mysql-test/r/sp.result:
        Added test case for bug #9565 "Wrong locking in stored procedure if a
        sub-sequent procedure is called".
      mysql-test/t/sp.test:
        Added test case for bug #9565 "Wrong locking in stored procedure if a
        sub-sequent procedure is called".
      32e157ec
    • unknown's avatar
      Improve a comment. · ba7d8ad7
      unknown authored
      ba7d8ad7
    • unknown's avatar
      BUG#11596 (partial fix), IP addresses not shown in ndb_mgm SHOW command on... · 22b6dec5
      unknown authored
       BUG#11596 (partial fix), IP addresses not shown in ndb_mgm SHOW command on second ndb_mgmd (or on ndb_mgmd restart)
      
      
      
      22b6dec5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · d5072ac1
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      d5072ac1
    • unknown's avatar
      - manual merge of the fix for BUG#10984: create a "mysql" user group and assign the · 7dbae42b
      unknown authored
        mysql user account to that group in the server postinstall section of the RPM spec
        file
      
      
      support-files/mysql.spec.sh:
        - manual merge of the fix for BUG#10984: create a "mysql" user group and assign the 
          mysql user account to that group in the server postinstall section.
      7dbae42b
    • unknown's avatar
      RPM spec file improvements: · 5c27ff06
      unknown authored
      - create a "mysql" user group and assign the mysql user account to that group
        in the server postinstall section. (BUG 10984)
      - backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
        Brazilian translations, more consequent use of macros)
      
      
      support-files/mysql.spec.sh:
        - create a "mysql" user group and assign the mysql user account to that group
          in the server postinstall section. (BUG 10984)
        - backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
          Brazilian translations, more consequent use of macros)
      5c27ff06
    • unknown's avatar
      Jim's fix for the #10443. · 10b76d41
      unknown authored
      Fix handling of floats and doubles when using prepared statements             
      API in the embedded server. 
      
      
      sql/sql_prepare.cc:
        Jim's fix for the #10443.
        
        Within the embedded server, there's no need to use float4get()              
        and float8get() for setting parameters, since they are never                
        stored.
      10b76d41
    • unknown's avatar
      merge, adopted structured event interface to filter out "PING" events c.f.... · 293539ca
      unknown authored
      merge, adopted structured event interface to filter out "PING" events c.f. BUG#11898, ndb_mgmd does not release resources
      
      
      
      293539ca
  2. 14 Jul, 2005 24 commits
    • unknown's avatar
      Merge · fd152f68
      unknown authored
      
      ndb/include/util/SocketServer.hpp:
        Auto merged
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      ndb/src/common/util/SocketClient.cpp:
        Auto merged
      ndb/src/common/util/SocketServer.cpp:
        Auto merged
      ndb/src/common/util/version.c:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmclient/main.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/ndbapi/ClusterMgr.cpp:
        Auto merged
      ndb/tools/restore/restore_main.cpp:
        Auto merged
      ndb/include/util/ndb_opts.h:
        merge
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        merge
      ndb/src/common/transporter/TransporterRegistry.cpp:
        merge
      ndb/src/mgmapi/mgmapi.cpp:
        merge
      ndb/src/mgmclient/CommandInterpreter.cpp:
        merge
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        merge
      ndb/src/mgmsrv/Services.cpp:
        merge
      ndb/src/mgmsrv/main.cpp:
        merge
      ndb/src/ndbapi/TransporterFacade.cpp:
        merge
      fd152f68
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 908ff34e
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      908ff34e
    • unknown's avatar
      take into account table lock mode when opening table: · 7f80ca54
      unknown authored
      try to find most suitable table, to avouid pickup table with too low locking mode or occupy table with write mode for select when it will be need for update later
      (BUG#9597)
      
      
      mysql-test/r/view.result:
        opening table in correct locking mode test
      mysql-test/t/view.test:
        opening table in correct locking mode test
      sql/sql_base.cc:
        take into account table lock mode when opening table:
        try to find most suitable table, to avouid pickup table with too low locking mode or occupy table with write mode for select when it will be need for update later
      7f80ca54
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · 3357d89b
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      mysql-test/t/ps.test:
        Manual merge
      3357d89b
    • unknown's avatar
      Fix ps.test in --ps-protocol · 951dacdc
      unknown authored
      
      mysql-test/t/ps.test:
        Disable prepared statements for a part of the test to avoid
        result mismatch.
      951dacdc
    • unknown's avatar
      Post-merge fixes. · ef095886
      unknown authored
      ef095886
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · b0641a3b
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      regex/regerror.c:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      mysql-test/r/ps.result:
        Manual merge
      mysql-test/t/ps.test:
        Manual merge
      sql/sql_yacc.yy:
        Manual merge
      b0641a3b
    • unknown's avatar
      Hastily remove an occasionally checked in symlink :( · 73386c15
      unknown authored
      
      BitKeeper/deleted/.del-var~507a9bd3b926223e:
        Delete: mysql-test/var
      73386c15
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d9e44dc7
      unknown authored
      into  mysql.com:/opt/local/work/mysql-4.1-root
      
      
      d9e44dc7
    • unknown's avatar
      A fix and a test case for Bug#11299 "prepared statement makes wrong SQL · cb7a5b53
      unknown authored
       syntax in binlog which stops replication":
      disallow the use of parameter markers which can lead to generation
      of malformed binlog queries. 
      
      
      mysql-test/r/ps.result:
        Test results fixed: a test case for Bug#11299
      mysql-test/t/ps.test:
        A test case for Bug#11299
      sql/sql_lex.cc:
        Introduce a new parser token for a parameter marker. Make sure
        that a parameter marker can not be used in a query which, when
        transformed to a binlog query, becomes grammatically incorrect.
      sql/sql_yacc.yy:
        The check for COM_PREPARE has been moved into the lexer.
      mysql-test/var:
        New BitKeeper file ``mysql-test/var''
      cb7a5b53
    • unknown's avatar
      Merge mysqldev@production:my/mysql-4.1-release · 297f80ed
      unknown authored
      into mysql.com:/space/my/mysql-4.1.13-clone
      
      
      297f80ed
    • unknown's avatar
      misc (memleak) fixes: · 638fe9ec
      unknown authored
          added using ndb_end and showing mem allocation stat at exit
          added init of variable
          added destruction of LocalConfig to still memleak
          added delete of theFacade on exit
          stopSessions(true) on socket server to ensure destuction of threads
          added destruction of arbit manager thread
          added true option to stopSessions in transporter facade to ensure destructions of threads
      
      
      ndb/include/util/ndb_opts.h:
        added using ndb_end and showing mem allocation stat at exit
      ndb/src/common/logger/LogHandler.cpp:
        added init of variable
      ndb/src/mgmapi/mgmapi.cpp:
        added destruction of LocalConfig to still memleak
        debug printouts
      ndb/src/mgmclient/main.cpp:
        added using ndb_end and showing mem allocation stat at exit
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        added delete of theFacade on exit
        removed area51
        added debug prints
      ndb/src/mgmsrv/main.cpp:
        added using ndb_end and showing mem allocation stat at exit
        moved glob struct to heap to enable ndb_end usage
        moved options out of glob struct
        stopSessions(true) on socket server to ensure destuction of threads
      ndb/src/ndbapi/ClusterMgr.cpp:
        added destruction of arbit manager thread
        debug printouts
      ndb/src/ndbapi/TransporterFacade.cpp:
        added true option to stopSessions in transporter facade to ensure destructions of threads
        + debug prints
      638fe9ec
    • unknown's avatar
      BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener · 2fdc89da
      unknown authored
          + added close of some fd's
          + debug prints
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
         BUG#11898 ndb_mgmd not releasing resources, added "ping"
        + debug prints
      ndb/src/mgmsrv/MgmtSrvr.hpp:
         BUG#11898 ndb_mgmd not releasing resources, added "ping"
        + debug prints
      ndb/src/mgmsrv/Services.cpp:
         BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener
        + added close of some fd's
        + debug prints
      2fdc89da
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 77509050
      unknown authored
      into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
      
      
      77509050
    • unknown's avatar
      Post-merge fixes. · d12fd45d
      unknown authored
      
      mysql-test/r/fulltext_order_by.result:
        A post-merge fix.
      mysql-test/t/fulltext_order_by.test:
        A post-merge fix (a different plan is chosen for a query in 5.0)
      sql/sql_select.cc:
        Post-merge fix.
      d12fd45d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 53bb8fa6
      unknown authored
      into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
      
      
      sql/item_func.cc:
        Auto merged
      53bb8fa6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a1a05ac8
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      a1a05ac8
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 86ae5158
      unknown authored
      into  linux.site:/home/reggie/bk/mysql-4.1
      
      
      86ae5158
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · 841f71b1
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      libmysql/libmysql.c:
        Manual merge
      tests/mysql_client_test.c:
        Manual merge
      841f71b1
    • unknown's avatar
      A fix and a test case for Bug#11183 "mysql_stmt_reset() doesn't reset · bd44c99b
      unknown authored
      information about error".
      
      
      libmysql/libmysql.c:
        Clear the last error on the statement if mysql_stmt_reset succeeded.
      tests/mysql_client_test.c:
        A test case for Bug#11183 "mysql_stmt_reset() doesn't reset information 
        about error"
      bd44c99b
    • unknown's avatar
      stilled mem leak in usage on getVersionString · f7c3e510
      unknown authored
          added __LINE__ so systemErrorLab for better error printout
      
      
      ndb/include/ndb_version.h.in:
        stilled mem leak in usage on getVersionString
      ndb/include/util/version.h:
        stilled mem leak in usage on getVersionString
      ndb/src/common/util/version.c:
        stilled mem leak in usage on getVersionString
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        added __LINE__ so systemErrorLab for better error printout
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        stilled mem leak in usage on getVersionString
        added __LINE__ so systemErrorLab for better error printout
      ndb/tools/restore/restore_main.cpp:
        stilled mem leak in usage on getVersionString
      f7c3e510
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · 5858a8cd
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      sql/field.cc:
        manual merge
      tests/mysql_client_test.c:
        manual merge
      mysql-test/r/select.result:
        manual merge
      mysql-test/t/select.test:
        manual merge
      sql/sql_select.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      5858a8cd
    • unknown's avatar
      added debug prints · 66fccd82
      unknown authored
      
      ndb/include/portlib/NdbTCP.h:
        added debug prints
      ndb/include/util/SocketServer.hpp:
        added debug prints
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        debug prints
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        debug prints
      ndb/src/common/portlib/NdbMutex.c:
        debug prints
      ndb/src/common/portlib/NdbTCP.cpp:
        debug printout
      ndb/src/common/portlib/NdbThread.c:
        debug printout
      ndb/src/common/transporter/TransporterRegistry.cpp:
        debug printout
      ndb/src/common/util/Parser.cpp:
        debug printout
      ndb/src/common/util/SocketClient.cpp:
        debug printout
      ndb/src/common/util/SocketServer.cpp:
        debug printout
      66fccd82
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 69ecbbcb
      unknown authored
      into  mysql.com:/opt/local/work/mysql-4.1-root
      
      
      69ecbbcb