1. 30 Nov, 2004 1 commit
  2. 29 Nov, 2004 8 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 324cab98
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      324cab98
    • unknown's avatar
      aligned backup errorcodes with rest of ndb error codes giving it range from 1300 · e79e1ab3
      unknown authored
          added new error type "configuration or application error"
          Added check if backup is issued during diskless mode, backup refuse returned
          added possibility to get error code as a result from management client
          addded possibility to set connecstring with CONNECT command
          changed to use strcasecmp instead of strcmp
          added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
          made thread safe veriosn of getErrorText in management server
          aligned backup errorcodes with rest of ndb error codes giving it range from 1300
          print error message from regular ndberror struct
          added new arrer type "cofiguration or application error"
          commented on allocaded ranges for errors
      
      
      ndb/include/kernel/signaldata/BackupImpl.hpp:
        aligned backup errorcodes with rest of ndb error codes giving it range from 1300
      ndb/include/kernel/signaldata/BackupSignalData.hpp:
        aligned backup errorcodes with rest of ndb error codes giving it range from 1300
      ndb/include/ndbapi/ndberror.h:
        added new error type "configuration or application error"
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Added check if backup is issued during diskless mode, backup refuse returned
      ndb/src/kernel/blocks/backup/Backup.hpp:
        member variable in backup block to indicate diskless or not
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Added check if backup is issued during diskless mode, backup refuse returned
      ndb/src/mgmclient/CommandInterpreter.cpp:
        added possibility to get error code as a result from management client
        addded possibility to set connecstring with CONNECT command
        changed to use strcasecmp instead of strcmp
      ndb/src/mgmclient/main.cpp:
        added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
      ndb/src/mgmclient/ndb_mgmclient.hpp:
        added possibility to get error code as a result from management client
      ndb/src/mgmsrv/CommandInterpreter.cpp:
        made thread safe veriosn of getErrorText in management server
      ndb/src/mgmsrv/CommandInterpreter.hpp:
        made thread safe veriosn of getErrorText in management server
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        aligned backup errorcodes with rest of ndb error codes giving it range from 1300
        print error message from regular ndberror struct
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        made thread safe veriosn of getErrorText in management server
      ndb/src/mgmsrv/Services.cpp:
        made thread safe veriosn of getErrorText in management server
      ndb/src/mgmsrv/Services.hpp:
        made thread safe veriosn of getErrorText in management server
      ndb/src/ndbapi/ndberror.c:
        added new arrer type "cofiguration or application error"
        commented on allocaded ranges for errors
        aligned backup errors with rest of errors
      e79e1ab3
    • unknown's avatar
      Merge mysql.com:/space/bkroot/mysql-4.1 · 4f9d62e8
      unknown authored
      into mysql.com:/space/bk/b6148-mysql-4.1
      
      
      mysql-test/r/rpl_start_stop_slave.result:
        Auto merged
      4f9d62e8
    • unknown's avatar
      rpl_start_stop_slave.result: · 2b016c13
      unknown authored
        Syntax change between 4.0 and 4.1.
      
      
      mysql-test/r/rpl_start_stop_slave.result:
        Syntax change.
      2b016c13
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · e7de3b88
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      e7de3b88
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · b4aed6de
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Auto merged
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      b4aed6de
    • unknown's avatar
      ndb_grant.later: · 85be5fc3
      unknown authored
        Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
      
      
      mysql-test/t/ndb_grant.later:
        Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
      85be5fc3
    • unknown's avatar
      ndb - scan bug fix + more test cases · 9b023120
      unknown authored
      
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Improved doc. a bit
      ndb/src/ndbapi/NdbConnectionScan.cpp:
        Set error code
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Check error directly after taking mutex
      ndb/test/ndbapi/testScan.cpp:
        new scan test with lots of threads
      ndb/test/run-test/daily-basic-tests.txt:
        Added two more scan tests
        Collapsed testTransactions & testOperations
      9b023120
  3. 28 Nov, 2004 6 commits
  4. 26 Nov, 2004 7 commits
    • unknown's avatar
      added error code message for 897 · b8defc72
      unknown authored
      b8defc72
    • unknown's avatar
      srv0srv.c: · 5889a531
      unknown authored
        srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
        only if --innodb_status_file=1
      
      
      innobase/srv/srv0srv.c:
        srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
        only if --innodb_status_file=1
      5889a531
    • 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
    • unknown's avatar
      Fixes while reviewing code · 921bbd95
      unknown authored
      (Cleanups and better bug fixes)
      
      
      mysql-test/r/select.result:
        Fixed test after wrong merge
      mysql-test/t/select.test:
        Fixed test after wrong merge
      scripts/mysql_fix_privilege_tables.sh:
        Don't read defaults files
      sql/item_cmpfunc.cc:
        Fix wrong value for not_null_tables_cache
      sql/item_cmpfunc.h:
        Remove wrong patch (flags are set in fix_length_and_dec())
      sql/item_func.h:
        Fix wrong value for not_null_tables_cache
      sql/slave.cc:
        Fixed indentation
      921bbd95
  5. 25 Nov, 2004 18 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 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 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 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 mysql.com:/home/timka/mysql/src/4.0-virgin · a67c64c2
      unknown authored
      into mysql.com:/home/timka/mysql/src/4.0-master
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      a67c64c2
    • 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 for BUG#3759 which was missing from the main tree for some reason. · 84c8cec7
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/item_cmpfunc.h:
        Auto merged
      mysql-test/r/select.result:
        Merge for BUG#3759
      mysql-test/t/select.test:
        Merge for BUG#3759
      84c8cec7
    • 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