1. 02 Dec, 2004 12 commits
  2. 01 Dec, 2004 7 commits
    • unknown's avatar
      configure.in: · befcff9b
      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
      befcff9b
    • unknown's avatar
      Move common trailing space checks into an include file. · 561ee8fd
      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.
      561ee8fd
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2d2d61d1
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      2d2d61d1
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 28d18c00
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      28d18c00
    • unknown's avatar
      testcase for bug#6871, ndb, replace with collations · e4dbc32f
      unknown authored
      
      mysql-test/r/ndb_charset.result:
        testcase for bug#6871
      mysql-test/t/ndb_charset.test:
        testcase for bug#6871
      e4dbc32f
    • unknown's avatar
      bug#6871 - ndb · 62e7f1ca
      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
      62e7f1ca
    • unknown's avatar
      openssl_1.result, have_openssl_1.require, openssl_1.test: · 4386e0c3
      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
      4386e0c3
  3. 30 Nov, 2004 21 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