1. 15 Jun, 2005 1 commit
    • unknown's avatar
      Fix for BUG#11211 "GROUP BY doesn't work correctly" · 5e144bf7
      unknown authored
        
      When the GROUP BY clause contains a column reference that can be resolved to
      both an aliased column in the SELECT list, and to a column in the FROM clause,
      the group column is resolved to the column in the FROM clause (for ANSI conformance).
      However, it may be so that the user's intent is just the other way around, and he/she
      gets the query results grouped by a completely different column than expexted.
      This patch adds a warning in such cases that tells the user that there is potential
      ambiguity in the group column.
      
      sql/sql_select.cc
      - Added a warning when a GROUP column is ambiguous due to that there is a
        column reference with the same name both in the SELECT and FROM clauses.
        In this case we resolve to the column in FROM clause and warn the user
        of a possible ambiguity.
      - More extensive comments.
      - Changed the function to return bool instead of int (as in other places).
      
      mysql-test/t/group_by.test
        Added test for BUG#11211.
      
      mysql-test/r/group_by.result
        Added test for BUG#11211.
      
      
      mysql-test/r/group_by.result:
        Import patch 11211.diff
      mysql-test/t/group_by.test:
        Import patch 11211.diff
      sql/sql_select.cc:
        Import patch 11211.diff
      BitKeeper/etc/ignore:
        Added ndb/src/dummy.cpp to the ignore list
      mysql-test/r/alias.result:
        Added warning for potentially ambiguous column.
      mysql-test/r/having.result:
        Added warning for potentially ambiguous column.
      5e144bf7
  2. 14 Jun, 2005 20 commits
  3. 13 Jun, 2005 19 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