1. 14 Jun, 2005 9 commits
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · fd502407
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      fd502407
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 261e8ea0
      unknown authored
      into mysql.com:/home/timka/mysql/src/5.0-bug-11044
      
      261e8ea0
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · da759f46
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
      
      da759f46
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · d0de2348
      unknown authored
      into mysql.com:/home/timka/mysql/src/5.0-bug-11044
      
      d0de2348
    • unknown's avatar
      Fix for BUG#11044 - "SELECT DISTINCT on indexed column returns inconsistent results" · 336a6ea3
      unknown authored
      The problem was that when there was no MIN or MAX function, after finding the
      group prefix based on the DISTINCT or GROUP BY attributes we did not search further
      for a key in the group that satisfies the equi-join conditions on attributes that
      follow the group attributes. Thus we ended up with the wrong rows, and subsequent
      calls to select_cond->val_int() in evaluate_join_record() were filtering those
      rows. Hence - the query result set was empty.
      
      The problem occured both for GROUP BY queries without MIN/MAX and for queries
      with DISTINCT (which were internally executed as GROUP BY queries).
      
      
      mysql-test/r/group_min_max.result:
        Added test result for BUG#11044. Notice that the group by query is
        equivalent to the distinct query and both are executed via the same
        algorithm.
      mysql-test/t/group_min_max.test:
        Added test for BUG#11044. Notice that the group by query is
        equivalent to the distinct query and both are executed via the
        same algorithm.
      sql/opt_range.cc:
        * Use the extended prefix in QUICK_GROUP_MIN_MAX_SELECT::get_next()
          to find keys that satisfy equality conditions in the case when there is
          no MIN or MAX function.
        * Corrected some method comments.
        * Corrected debug printout of cost information.
      336a6ea3
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5e7b2573
      unknown authored
      into mysql.com:/usr/home/ram/work/mysql-5.0
      
      5e7b2573
    • unknown's avatar
      a fix (#11235: Expression with IFNULL yields 18 where 1 is correct). · 99ac9678
      unknown authored
      
      sql/item_func.cc:
        a fix (#11235: Expression with IFNULL yields 18 where 1 is correct).
        We should pass res end pointer to the strtoll10().
      99ac9678
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e1742a0
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      mysql-test/r/func_if.result:
        Auto merged
      mysql-test/t/func_if.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      0e1742a0
    • unknown's avatar
      Manual merge · ab33f15a
      unknown authored
      ab33f15a
  2. 13 Jun, 2005 23 commits
    • unknown's avatar
      merge · 7511eefc
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      7511eefc
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · bb93e5f6
      unknown authored
      into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
      
      bb93e5f6
    • unknown's avatar
      Manual merge · e477fc7f
      unknown authored
      
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/func_if.result:
        Manual merge.
      e477fc7f
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · fbeb7678
      unknown authored
      into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      fbeb7678
    • unknown's avatar
      func_if.result, func_if.test: · 9a639503
      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.
      9a639503
    • unknown's avatar
      func_if.result, func_if.test: · b5aae700
      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.
      b5aae700
    • unknown's avatar
      logging_ok: · fa405f97
      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
      fa405f97
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7708229d
      unknown authored
      into igor-inspiron.creware.com:/home/igor/mysql-5.0
      
      7708229d
    • unknown's avatar
      Merge igor-inspiron.creware.com:/home/igor/mysql-4.1 · efe487ba
      unknown authored
      into igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
      
      efe487ba
    • unknown's avatar
      ha_innodb.cc: · 340819b6
      unknown authored
        Add a patch by Georg Richter to remove compiler warnings on 64-bit Windows
      
      
      sql/ha_innodb.cc:
        Add a patch by Georg Richter to remove compiler warnings on 64-bit Windows
      340819b6
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · f40fb7f8
      unknown authored
      into mysql.com:/home/svoj/devel/yassl-mysql-5.0
      
      f40fb7f8
    • unknown's avatar
      Merge igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0 · a43072e1
      unknown authored
      into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      mysql-test/r/ctype_utf8.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a43072e1
    • unknown's avatar
      Making XID deterministic for rpl_ddl test · c6d7ccf3
      unknown authored
      
      mysql-test/r/rpl_ddl.result:
        Making XID deterministic for test
      mysql-test/t/rpl_ddl.test:
        Making XID deterministic for test
      c6d7ccf3
    • unknown's avatar
      ctype_utf8.test, ctype_utf8.result: · f56681be
      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
      f56681be
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · e0cd986e
      unknown authored
      into mysql.com:/home/svoj/devel/yassl-mysql-5.0
      
      e0cd986e
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · b2d666a0
      unknown authored
      into mysql.com:/home/svoj/devel/yassl-mysql-5.0
      
      b2d666a0
    • unknown's avatar
      Merge mysql.com:/home/bk/b6883-mysql-4.1 · bdb056ef
      unknown authored
      into mysql.com:/home/bk/mysql-5.0
      
      bdb056ef
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 · f1d7bb0f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/sql_parse.cc:
        Auto merged
      f1d7bb0f
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1 · a4235b64
      unknown authored
      into mysql.com:/home/bk/b6883-mysql-4.1
      
      a4235b64
    • unknown's avatar
      merge · 39582ecd
      unknown authored
      
      ndb/src/common/logger/Logger.cpp:
        Auto merged
      ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      ndb/tools/restore/consumer_restore.cpp:
        Auto merged
      39582ecd
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7222dbd6
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-push
      
      7222dbd6
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · c2f68ecc
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-push
      
      c2f68ecc
    • unknown's avatar
      bug#10294 - ndb restore with #concurrent transactions < parallelism · d07b915a
      unknown authored
        Enable retry on startTransaction
      
      
      ndb/tools/restore/consumer_restore.cpp:
        Enable retry on startTransaction==NULL
      d07b915a
  3. 12 Jun, 2005 1 commit
    • unknown's avatar
      WL#2286 - Compile MySQL w/YASSL support · c0f99623
      unknown authored
        Fix for link failures on boxes with non-gnu compiler.
      
      
      client/Makefile.am:
        Add a dummy C++ file to client suite to make libtool use a C++ linker:
        this lets client suite link when using yaSSL and a non-gcc C++ compiler.
      config/ac-macros/yassl.m4:
        HAVE_YASSL conditional is used to add dummy C++ file if configured with yaSSL.
      tests/Makefile.am:
        Add a dummy C++ file to tests to make libtool use a C++ linker:
        this lets tests link when using yaSSL and a non-gcc C++ compiler.
      vio/Makefile.am:
        Use dummy C++ file if configured with yaSSL only.
      c0f99623
  4. 11 Jun, 2005 2 commits
    • unknown's avatar
      Merge · 77a98e8b
      unknown authored
      
      mysql-test/Makefile.am:
        Auto merged
      extra/yassl/taocrypt/include/modes.hpp:
        SCCS merged
      77a98e8b
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · bf793f55
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/lowercase_table2.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      bf793f55
  5. 10 Jun, 2005 5 commits