1. 26 Nov, 2004 4 commits
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 23132190
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/test/ndbapi/testScanPerf.cpp:
        Auto merged
      23132190
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · bf98c979
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      bf98c979
    • unknown's avatar
      cleaned up code a bit · 0345e117
      unknown authored
          added command CONNECT in management client
          added some verbose printouts
          removed prompt printout on !isatty(0)
      
      
      ndb/src/mgmapi/mgmapi.cpp:
        improved verbose printouts on connecting to management server
      ndb/src/mgmclient/CommandInterpreter.cpp:
        cleaned up code a bit
        added command CONNECT in management client
        added some verbose printouts
      ndb/src/mgmclient/main.cpp:
        removed prompt printout on !isatty(0)
      ndb/src/mgmclient/ndb_mgmclient.hpp:
        added verbose opotion
      0345e117
    • unknown's avatar
      ndb - bugfix testScanPerf · ca390e20
      unknown authored
      
      ndb/test/ndbapi/testScanPerf.cpp:
        1) Fix so that values are read even when using -q
        2) Divide by correct number
      ca390e20
  2. 25 Nov, 2004 17 commits
    • unknown's avatar
      ha_innodb.cc: · afc6dade
      unknown authored
        Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error
      
      
      sql/ha_innodb.cc:
        Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error
      afc6dade
    • unknown's avatar
      Many files: · 1afbe9c7
      unknown authored
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      
      
      innobase/buf/buf0buf.c:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/buf/buf0lru.c:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/include/buf0lru.h:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/include/db0err.h:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/include/row0sel.h:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/include/ut0mem.h:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/mem/mem0pool.c:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/row/row0mysql.c:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/row/row0sel.c:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/srv/srv0start.c:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      innobase/ut/ut0mem.c:
        Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
      1afbe9c7
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f1e8ae93
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      f1e8ae93
    • unknown's avatar
      moved default setting to config.ini to MgmtSrvr · 4cedfb91
      unknown authored
      only try to connect to other ndb_mgmd if connect_string explicitly given or config_file not given
      
      
      ndb/src/mgmsrv/main.cpp:
        moved default setting to config.ini to MgmtSrvr
      4cedfb91
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1 · 23caeac6
      unknown authored
      into mysql.com:/space/bkroot/mysql-4.1
      
      23caeac6
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 77a0f7ff
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
      
      77a0f7ff
    • unknown's avatar
      table.cc: · d35818bb
      unknown authored
        Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
      
      
      sql/table.cc:
        Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
      d35818bb
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3c5d3814
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      3c5d3814
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 9dc944c9
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      9dc944c9
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0466c917
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      0466c917
    • unknown's avatar
      ndb/src/common/logger/LogHandler.cpp · 93118f79
      unknown authored
          changed so that error is returned if format is wrong in logger param parsing
      ndb/src/common/logger/Logger.cpp
          some debuf printout added
      ndb/src/mgmsrv/InitConfigFileParser.cpp
          rewrote parsing on parseNameValuePair, was buggy
      
      
      ndb/src/common/logger/LogHandler.cpp:
        changed so that error is returned if format is wrong in logger param parsing
      ndb/src/common/logger/Logger.cpp:
        some debuf printout added
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        rewrote parsing on parseNameValuePair, was buggy
      93118f79
    • unknown's avatar
      Merge · 2e3d8fd6
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Merging 4.0 and 4.1 changes.
      2e3d8fd6
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2cc4d329
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      2cc4d329
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 0971d6f9
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      0971d6f9
    • unknown's avatar
      bug#6775 - ndb - fix bug introduced by bug fix · 64a9c403
      unknown authored
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Scan number allocation must be on table even in case of range scan
        Otherwise scan takeover won't work as LQHKEYREQ contains table
      64a9c403
    • unknown's avatar
      Merge mysql.com:/space/bkroot/mysql-4.0 · 99ef45cb
      unknown authored
      into mysql.com:/space/bk/b6148-mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      99ef45cb
    • unknown's avatar
      Fix for Bug#6148. Only rewind read position in binary log when the · 324b3a45
      unknown authored
      slave SQL thread is started.
      
      
      sql/slave.cc:
        Adding threads to init as parameter to init_master_info.
        Only rewind read position when starting SQL thread.
      sql/slave.h:
        Adding threads to init as parameter to init_master_info.
        Only rewind read position when starting SQL thread.
      sql/sql_repl.cc:
        Adding threads to init as parameter to init_master_info.
        Only rewind read position when starting SQL thread.
      sql/repl_failsafe.cc:
        Adding threads to init as parameter to init_master_info.
        Only rewind read position when starting SQL thread.
      324b3a45
  3. 24 Nov, 2004 19 commits