1. 02 Dec, 2004 1 commit
    • unknown's avatar
      Change to prevent the failure of "make distclean" on the missing... · d3b6349a
      unknown authored
      Change to prevent the failure of "make distclean" on the missing 'regex/Makefile' (and, later, 'strings/Makefile').
      
      
      configure.in:
        The subdirectories 'strings' and 'regex' were each contained in both the 'sql_client_dirs' and the 'sql_server_dirs' macro.
        As these are used to form the (Makefile) macro 'SUBDIRS' and 'DIST_SUBDIRS', these subdirectories will get listed there twice.
        This causes a failure of the (recursive) "make distclean", so this double inclusion must be prevented.
      d3b6349a
  2. 01 Dec, 2004 5 commits
  3. 30 Nov, 2004 31 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49156903
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      49156903
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 682a8fbb
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      mysql-test/r/flush_block_commit.result:
        Auto merged
      mysql-test/t/flush_block_commit.test:
        Auto merged
      sql/lock.cc:
        Auto merged
      682a8fbb
    • unknown's avatar
      two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next... · 352ad815
      unknown authored
      two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
      (originally reported as "second run of innobackup hangs forever and can even hang server").
      Plus testcase for the bugfix and comments about global read locks.
      
      
      mysql-test/r/flush_block_commit.result:
        result update
      mysql-test/t/flush_block_commit.test:
        testing bugfix (originally: second run of innobackup hangs)
      sql/lock.cc:
        When we are in start_waiting_global_read_lock(), if we ourselves have
        the global read lock, there is nothing to start. This makes a pair with how 
        wait_if_global_read_lock() behaves when we ourselves have the global read lock.
        Previously, start_waiting_global_read_lock() decremented protect... whereas wait_if_global_read_lock()
        hadn't incremented it => very wrong => hangs.
        Descriptive comments on how global read lock works.
      352ad815
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 12420401
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      innobase/include/lock0lock.h:
        Auto merged
      12420401
    • unknown's avatar
      lock0lock.h: · 1983ff72
      unknown authored
        Rename lock_table_exclusive to lock_is_table_exclusive
        (somehow this change was omitted from last changeset)
      
      
      innobase/include/lock0lock.h:
        Rename lock_table_exclusive to lock_is_table_exclusive
        (somehow this change was omitted from last changeset)
      1983ff72
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 4579806f
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      4579806f
    • unknown's avatar
      fixed so that warning on missing support for engine only printed once even if... · ac207293
      unknown authored
      fixed so that warning on missing support for engine only printed once even if option given multiple times
      
      
      
      ac207293
    • unknown's avatar
      typo fixed · 928d2a8b
      unknown authored
      928d2a8b
    • unknown's avatar
      fixed error in test result · be733ad1
      unknown authored
          added extra calls to retrieve connectstring used
          reengineered connect somewhat to make retries etc explicit
      
      
      mysql-test/r/ndb_index_unique.result:
        fixed error in test result
      ndb/include/mgmapi/mgmapi.h:
        added extra calls to retrieve connectstring used
      ndb/include/mgmcommon/ConfigRetriever.hpp:
        added extra calls to retrieve connectstring used
      ndb/include/ndbapi/ndb_cluster_connection.hpp:
        added extra calls to retrieve connectstring used
        reengineered connect somewhat to make retries etc explicit
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        added extra calls to retrieve connectstring used
      ndb/src/mgmapi/mgmapi.cpp:
        added extra calls to retrieve connectstring used
      ndb/src/mgmclient/CommandInterpreter.cpp:
        moved parse of quit to avoid connect before
      ndb/src/ndbapi/Ndbinit.cpp:
        reengineered connect somewhat to make retries etc explicit
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        added extra calls to retrieve connectstring used
        reengineered connect somewhat to make retries etc explicit
      ndb/tools/listTables.cpp:
        reengineered connect somewhat to make retries etc explicit
      sql/ha_ndbcluster.cc:
        added extra calls to retrieve connectstring used
        reengineered connect somewhat to make retries etc explicit
      be733ad1
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 99e69f26
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      innobase/lock/lock0lock.c:
        Auto merged
      99e69f26
    • unknown's avatar
      lock0lock.c: · 93d5f62e
      unknown authored
        If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
      
      
      innobase/lock/lock0lock.c:
        If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
      93d5f62e
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 892cec85
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      892cec85
    • unknown's avatar
      row0sel.c: · 668d61b9
      unknown authored
        Remove compiler warning as I had forgotten an include file
      
      
      innobase/row/row0sel.c:
        Remove compiler warning as I had forgotten an include file
      668d61b9
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 795045d9
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      795045d9
    • unknown's avatar
      fc157af3
    • unknown's avatar
      InnoDB: Allow ALTER TABLE to do intermediate COMMIT also when the table · d6180d37
      unknown authored
      contains auto_increment columns.  (Bug #6633)
      
      
      innobase/include/lock0lock.h:
        Replaced lock_get_table()
        with lock_get_src_table() and lock_is_table_exclusive()
      innobase/lock/lock0lock.c:
        Replaced lock_get_table()
        with lock_get_src_table() and lock_is_table_exclusive()
      sql/ha_innodb.cc:
        ha_innobase::write_row(): Improve the ALTER TABLE optimization
        (do intermediate COMMIT also if table contains auto_increment columns)
      d6180d37
    • unknown's avatar
      ps_7ndb.result, ps_7ndb.test: · ea661485
      unknown authored
        ndb now runs ps tests just like the others
      
      
      mysql-test/t/ps_7ndb.test:
        ndb now runs ps tests just like the others
      mysql-test/r/ps_7ndb.result:
        ndb now runs ps tests just like the others
      ea661485
    • unknown's avatar
      mysqld.cc: · cb6007ce
      unknown authored
        fixed erroneous previous push
      
      
      sql/mysqld.cc:
        fixed erroneous previous push
      cb6007ce
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 16a130a2
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      
      16a130a2
    • unknown's avatar
      added check connection mgmapi method · 07ed8294
      unknown authored
      added ndb_mgm_check_connection when error is printed
      
      
      ndb/include/mgmapi/mgmapi.h:
        added check connection mgmapi method
      ndb/src/mgmapi/mgmapi.cpp:
        added check connection mgmapi method
      ndb/src/mgmclient/CommandInterpreter.cpp:
        added mgm_check_check_connection when error is printed
      ndb/src/mgmsrv/Services.cpp:
        added check connection mgmapi method
      ndb/src/mgmsrv/Services.hpp:
        added check connection mgmapi method
      07ed8294
    • unknown's avatar
      Portability fix. Why not to use UINT_MAX32 here? · 32fa7e0f
      unknown authored
      32fa7e0f
    • unknown's avatar
      mysqld.cc: · 3eada05d
      unknown authored
        fixed typo
      
      
      sql/mysqld.cc:
        fixed typo
      3eada05d
    • unknown's avatar
      fixed bug/compiler warning · 45968d1f
      unknown authored
          rewrote safer
          added return value to shutdown
          nicer printouts
          removed exit at shutdown
      
      
      ndb/src/common/logger/Logger.cpp:
        fixed bug/compiler warning
      ndb/src/mgmapi/LocalConfig.cpp:
        removed compiler warning
        rewrote safer
      ndb/src/mgmclient/CommandInterpreter.cpp:
        added return value to shutdown
        nicer printouts
        removed exit at shutdown
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        fixed compiler warning
      45968d1f
    • unknown's avatar
      add warnings for INNODB,BDB,ISAM being unavailable if switch to use is... · 73687551
      unknown authored
      add warnings for INNODB,BDB,ISAM being unavailable if switch to use is supplied, i.e. --bdb,--isam,--innodb
      
      
      
      73687551
    • unknown's avatar
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8da148ab
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      
      sql/mysqld.cc:
        Auto merged
      8da148ab
    • unknown's avatar
      added use of mysql_cluster in mysqld (e.g. for ndb-connectstring) · 828cefb3
      unknown authored
      added warning printout if --ndbcluster switch is given in a "non-cluster" binary
      
      
      828cefb3
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0dacdfcc
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
      
      
      client/mysqldump.c:
        Auto merged
      0dacdfcc
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · bfab8644
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      bfab8644
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 49c8409c
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      mysql-test/r/ndb_index_unique.result:
        Auto merged
      mysql-test/t/ndb_index_unique.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      49c8409c
    • unknown's avatar
      ndb - fixed long overdue problems with unique indexes and null values · 94a5379f
      unknown authored
      
      mysql-test/r/ndb_index_unique.result:
        Test of unique index and null
      mysql-test/t/ndb_index_unique.test:
        Test of unique index and null
      sql/ha_ndbcluster.cc:
        Fixed long overdue problems with unique indexes and null values
      94a5379f
  4. 29 Nov, 2004 3 commits
    • unknown's avatar
      Applied some Netware related patches. · 41ade141
      unknown authored
      
      client/mysqladmin.cc:
        Added option to mysqladmin for Netware.
      netware/comp_err.def:
        Copyright notice update, for Netware.
      netware/isamchk.def:
        Copyright notice update, for Netware.
      netware/isamlog.def:
        Copyright notice update, for Netware.
      netware/libmysql.def:
        Copyright notice update, for Netware.
      netware/my_print_defaults.def:
        Copyright notice update, for Netware.
      netware/myisam_ftdump.def:
        Copyright notice update, for Netware.
      netware/myisamchk.def:
        Copyright notice update, for Netware.
      netware/myisamlog.def:
        Copyright notice update, for Netware.
      netware/myisampack.def:
        Copyright notice update, for Netware.
      netware/mysql.def:
        Copyright notice update, for Netware.
      netware/mysql_install.def:
        Copyright notice update, for Netware.
      netware/mysql_install_db.def:
        Copyright notice update, for Netware.
      netware/mysql_test_run.def:
        Copyright notice update, for Netware.
      netware/mysql_waitpid.def:
        Copyright notice update, for Netware.
      netware/mysqladmin.def:
        Copyright notice update, for Netware.
      netware/mysqlbinlog.def:
        Copyright notice update, for Netware.
      netware/mysqlcheck.def:
        Copyright notice update, for Netware.
      netware/mysqld.def:
        Copyright notice update, for Netware.
      netware/mysqld_safe.def:
        Copyright notice update, for Netware.
      netware/mysqldump.def:
        Copyright notice update, for Netware.
      netware/mysqlimport.def:
        Copyright notice update, for Netware.
      netware/mysqlshow.def:
        Copyright notice update, for Netware.
      netware/mysqltest.def:
        Copyright notice update, for Netware.
      netware/pack_isam.def:
        Copyright notice update, for Netware.
      netware/perror.def:
        Copyright notice update, for Netware.
      netware/replace.def:
        Copyright notice update, for Netware.
      netware/resolve_stack_dump.def:
        Copyright notice update, for Netware.
      netware/resolveip.def:
        Copyright notice update, for Netware.
      sql/mysqld.cc:
        Changes to fix the abend on NetWare on recieving the server down and volume deactivation 
        events. Do not join for the main thread if these events occur
      41ade141
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 905db498
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      
      905db498
    • unknown's avatar
      aligned backup errorcodes with rest of ndb error codes giving it range from 1300 · 3d3ad211
      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
      3d3ad211