1. 13 Jun, 2005 11 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 91a7d4e7
      unknown authored
      into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
      
      
      91a7d4e7
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 02736082
      unknown authored
      into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      02736082
    • unknown's avatar
      func_if.result, func_if.test: · a4535bc8
      unknown authored
        Correction for test case of bug #11142.
      
      
      mysql-test/t/func_if.test:
        Correction for test case of bug #11142.
      mysql-test/r/func_if.result:
        Correction for test case of bug #11142.
      a4535bc8
    • unknown's avatar
      func_if.result, func_if.test: · 89906482
      unknown authored
        Added a test case for bug #11142.
      item_cmpfunc.cc:
        Fixed bug #11142.
        Implementation of Item_func_nullif::is_null was corrected.
      
      
      sql/item_cmpfunc.cc:
        Fixed bug #11142.
        Implementation of Item_func_nullif::is_null was corrected.
      mysql-test/t/func_if.test:
        Added a test case for bug #11142.
      mysql-test/r/func_if.result:
        Added a test case for bug #11142.
      89906482
    • unknown's avatar
      logging_ok: · 61962795
      unknown authored
        Logging to logging@openlogging.org accepted
      DbtcMain.cpp, testTimeout.cpp:
        Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
      
      
      ndb/test/ndbapi/testTimeout.cpp:
        Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      61962795
    • unknown's avatar
      Merge igor-inspiron.creware.com:/home/igor/mysql-4.1 · e802cd3b
      unknown authored
      into igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
      
      
      e802cd3b
    • unknown's avatar
      ctype_utf8.test, ctype_utf8.result: · 3f483c18
      unknown authored
        Added a test case for bug #11167.
      sql_select.cc:
        Fixed bug #11167.
        In 4.1 char/varchar fields are limited by 255 characters in
        length that make them longer than 255 bytes in size for such
        character sets as UTF8. The functions store_record_in_cache
        and read_cached_records did not take into account this
        Moreover the code did not take into account that the size
        of the varchar fields in 5.0 can be up to 65535 bytes
      
      
      sql/sql_select.cc:
        Fixed bug #11167.
        In 4.1 char/varchar fields are limited by 255 characters in
        length that make them longer than 255 bytes in size for such
        character sets as UTF8. The functions store_record_in_cache
        and read_cached_records did not take into account this
        Moreover the code did not take into account that the size
        of the varchar fields in 5.0 can be up to 65535 bytes
      mysql-test/r/ctype_utf8.result:
        Added a test case for bug #11167.
      mysql-test/t/ctype_utf8.test:
        Added a test case for bug #11167.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      3f483c18
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1 · 8c4fe301
      unknown authored
      into mysql.com:/home/bk/b6883-mysql-4.1
      
      
      8c4fe301
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 53a92c87
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      53a92c87
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 861cecf3
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      861cecf3
    • unknown's avatar
      bug#10294 - ndb restore with #concurrent transactions < parallelism · 06ab9013
      unknown authored
        Enable retry on startTransaction
      
      
      ndb/tools/restore/consumer_restore.cpp:
        Enable retry on startTransaction==NULL
      06ab9013
  2. 10 Jun, 2005 11 commits
  3. 09 Jun, 2005 15 commits
  4. 08 Jun, 2005 3 commits
    • unknown's avatar
      Fix problem with handling of lower_case_table_name == 2 when · c23ef5e1
      unknown authored
      the case in the FROM and WHERE clauses didn't agree. (Bug #9500)
      
      
      mysql-test/r/lowercase_table2.result:
        Update results
      mysql-test/t/lowercase_table2.test:
        Fix 'DROP TABLE' to not drop tables with the same name.
      sql/mysqld.cc:
        Move initialization of table_alias_charset to after we
        have decided what lower_case_table_names should be.
      c23ef5e1
    • unknown's avatar
      Merge mysql.com:/var/tmp/sslbug/mysql-4.0 · 226ecf1d
      unknown authored
      into mysql.com:/var/tmp/sslbug/mysql-4.1
      
      
      include/my_global.h:
        Auto merged
      226ecf1d
    • unknown's avatar
      Fix for · 59445ce4
      unknown authored
      BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
      BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
      Remove obsolete code.
      
      
      include/my_global.h:
        Obsolete code removed. OpenSSL doesn't have crypt anymore (it was dropped in ~2003).
        This patch fixes compilation failures with both OpenSSL and yaSSL on systems where
        crypt was defined in unistd.h.
        Conclusion is we do not use OpenSSL's crypt unless it wasn't defined in
        unistd.h/crypt.h and it was defined in old OpenSSL.
      59445ce4