1. 16 Jun, 2005 1 commit
    • unknown's avatar
      Post-fix for BUG#11211 · d7ad8711
      unknown authored
      Exclude the query that generates warning from PS tests, due to extra warning
      under PS.
      
      
      d7ad8711
  2. 15 Jun, 2005 7 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 67c204c4
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      sql/sql_select.cc:
        Auto merged
      67c204c4
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b0df4494
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      b0df4494
    • unknown's avatar
    • unknown's avatar
      join_outer.result, join_outer.test: · 098d02eb
      unknown authored
        Added a test case for bug #11285.
      sql_select.cc:
        Fixed bug #11285.
        The problem occurred with Item_equal in an 'on expression'
        that was evaluated to false.
      
      
      sql/sql_select.cc:
        Fixed bug #11285.
        The problem occurred with Item_equal in an 'on expression'
        that was evaluated to false.
      mysql-test/t/join_outer.test:
        Added a test case for bug #11285.
      mysql-test/r/join_outer.result:
        Added a test case for bug #11285.
      098d02eb
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · fd39c731
      unknown authored
      into mysql.com:/home/timka/mysql/src/5.0-dbg
      
      
      fd39c731
    • unknown's avatar
      b0502fc2
    • unknown's avatar
      Fix for BUG#11211 "GROUP BY doesn't work correctly" · 476ca52e
      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.
      476ca52e
  3. 14 Jun, 2005 20 commits
  4. 13 Jun, 2005 12 commits
    • unknown's avatar
      merge · 7bb5fe94
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      7bb5fe94
    • 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
      Manual merge · d039d345
      unknown authored
      
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/func_if.result:
        Manual merge.
      d039d345
    • 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 ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1a0bddb8
      unknown authored
      into igor-inspiron.creware.com:/home/igor/mysql-5.0
      
      
      1a0bddb8
    • 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
      ha_innodb.cc: · 95252da4
      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
      95252da4
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4fcc3dd8
      unknown authored
      into mysql.com:/home/svoj/devel/yassl-mysql-5.0
      
      
      4fcc3dd8
    • unknown's avatar
      Merge igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0 · 0cd6d1c6
      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
      0cd6d1c6