1. 01 Dec, 2004 7 commits
    • unknown's avatar
      configure.in: · 62446e4c
      unknown authored
        Let MySQL check the existence of readdir_r with 3 arguments; Solaris seems to have just 2 args
        Check the existence of readdir_r and localtime_r; even though MySQL does check these too, we need our own check for Hot Backup code
      os0file.c:
        Use re-entrant readdir_r where available
      ut0ut.c:
        Make a function to use thread-safe localtime_r where available; that particular function was not called from anywhere, though
      
      
      innobase/ut/ut0ut.c:
        Make a function to use thread-safe localtime_r where available; the function was not called from anywhere, though
      innobase/os/os0file.c:
        Use re-entrant readdir_r where available
      innobase/configure.in:
        Let MySQL check the existence of readdir_r with 3 arguments; Solaris seems to have just 2 args
      62446e4c
    • unknown's avatar
      Move common trailing space checks into an include file. · b72c899e
      unknown authored
      Check UCS2 trailing spaces.
      
      
      mysql-test/r/ctype_ucs.result:
        Move common trailing space checks into an include file.
        Check UCS2 trailing spaces.
        Fix UCS2 to handle trailing spaces in PAD way.
      mysql-test/t/ctype_ucs.test:
        Move common trailing space checks into an include file.
        Check UCS2 trailing spaces.
        Fix UCS2 to handle trailing spaces in PAD way.
      mysql-test/t/endspace.test:
        Move common trailing space checks into an include file.
        Check UCS2 trailing spaces.
        Fix UCS2 to handle trailing spaces in PAD way.
      strings/ctype-ucs2.c:
        Move common trailing space checks into an include file.
        Check UCS2 trailing spaces.
        Fix UCS2 to handle trailing spaces in PAD way.
      b72c899e
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 542e2e66
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      542e2e66
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 3d3b5084
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      3d3b5084
    • unknown's avatar
      testcase for bug#6871, ndb, replace with collations · 3887dd5b
      unknown authored
      
      mysql-test/r/ndb_charset.result:
        testcase for bug#6871
      mysql-test/t/ndb_charset.test:
        testcase for bug#6871
      3887dd5b
    • unknown's avatar
      bug#6871 - ndb · 1c5a01e1
      unknown authored
        replace with charsets
        check update of primary key wo/ normalizing
        
      
      
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Make sure tXfrmFlag is false when checking for update of primary key
      1c5a01e1
    • unknown's avatar
      openssl_1.result, have_openssl_1.require, openssl_1.test: · 82a908d8
      unknown authored
        Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
      
      
      mysql-test/t/openssl_1.test:
        Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
      mysql-test/r/have_openssl_1.require:
        Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
      mysql-test/r/openssl_1.result:
        Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      82a908d8
  2. 30 Nov, 2004 31 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 378cff13
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      378cff13
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · a9c794f1
      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
      a9c794f1
    • unknown's avatar
      two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next... · fff5c910
      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.
      fff5c910
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · c7bcdbe1
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      innobase/include/lock0lock.h:
        Auto merged
      c7bcdbe1
    • unknown's avatar
      lock0lock.h: · 521ac46b
      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)
      521ac46b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · a899d4e6
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      a899d4e6
    • unknown's avatar
      fixed so that warning on missing support for engine only printed once even if... · 9cb139fa
      unknown authored
      fixed so that warning on missing support for engine only printed once even if option given multiple times
      
      
      9cb139fa
    • unknown's avatar
      typo fixed · db9837cc
      unknown authored
      db9837cc
    • unknown's avatar
      fixed error in test result · a668ea8f
      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
      a668ea8f
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5a21e772
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      innobase/lock/lock0lock.c:
        Auto merged
      5a21e772
    • unknown's avatar
      lock0lock.c: · 555a0eec
      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
      555a0eec
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0b717e0c
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      0b717e0c
    • unknown's avatar
      row0sel.c: · fdbd7701
      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
      fdbd7701
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · e3b9dd2a
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      e3b9dd2a
    • unknown's avatar
      c3755204
    • unknown's avatar
      InnoDB: Allow ALTER TABLE to do intermediate COMMIT also when the table · fb8c2315
      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)
      fb8c2315
    • unknown's avatar
      ps_7ndb.result, ps_7ndb.test: · 4c3da7c1
      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
      4c3da7c1
    • unknown's avatar
      mysqld.cc: · 74296504
      unknown authored
        fixed erroneous previous push
      
      
      sql/mysqld.cc:
        fixed erroneous previous push
      74296504
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0aa9bc37
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      0aa9bc37
    • unknown's avatar
      added check connection mgmapi method · 137002d6
      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
      137002d6
    • unknown's avatar
      Portability fix. Why not to use UINT_MAX32 here? · 635f95d5
      unknown authored
      635f95d5
    • unknown's avatar
      mysqld.cc: · 69d1b437
      unknown authored
        fixed typo
      
      
      sql/mysqld.cc:
        fixed typo
      69d1b437
    • unknown's avatar
      fixed bug/compiler warning · d01d27e6
      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
      d01d27e6
    • unknown's avatar
      add warnings for INNODB,BDB,ISAM being unavailable if switch to use is... · 1fb5821b
      unknown authored
      add warnings for INNODB,BDB,ISAM being unavailable if switch to use is supplied, i.e. --bdb,--isam,--innodb
      
      
      1fb5821b
    • unknown's avatar
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 37bc1b04
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      
      sql/mysqld.cc:
        Auto merged
      37bc1b04
    • unknown's avatar
      added use of mysql_cluster in mysqld (e.g. for ndb-connectstring) · c7612e3d
      unknown authored
      added warning printout if --ndbcluster switch is given in a "non-cluster" binary
      
      c7612e3d
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 70f73798
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
      
      
      client/mysqldump.c:
        Auto merged
      70f73798
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3f3c904b
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      3f3c904b
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 97e369b5
      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
      97e369b5
    • unknown's avatar
      ndb - fixed long overdue problems with unique indexes and null values · aa1fb2c4
      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
      aa1fb2c4
  3. 29 Nov, 2004 2 commits
    • unknown's avatar
      Applied some Netware related patches. · caf12257
      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
      caf12257
    • 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