1. 16 Oct, 2006 2 commits
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 53924bdc
      unknown authored
      into  rakia.(none):/home/kgeorge/mysql/autopush/B14019-4.1-opt
      
      
      53924bdc
    • unknown's avatar
      BUG#14019 : group by converts literal string to column name · 750a2a0b
      unknown authored
         When resolving unqualified name references MySQL was not
         checking what is the item type for the reference. Thus
         e.g a string literal item that has by convention a name
         equal to its string value will also work as a reference to 
         a SELECT list item or a table field.
         Fixed by allowing only Item_ref or Item_field to referenced by
         (unqualified) name.
      
      
      mysql-test/r/func_gconcat.result:
        Bug #14019: group by converts literal string to column name
         - removed undeterministic testcase : order by a constant 
           means no order.
      mysql-test/r/group_by.result:
        Bug #14019: group by converts literal string to column name
         - test case
      mysql-test/t/func_gconcat.test:
        Bug #14019: group by converts literal string to column name
         - removed undeterministic testcase : order by a constant 
           means no order.
      mysql-test/t/group_by.test:
        Bug #14019: group by converts literal string to column name
         - test case
      sql/sql_base.cc:
        Bug #14019: group by converts literal string to column name
         - resolve unqualified by name refs only for real references
      750a2a0b
  2. 01 Oct, 2006 1 commit
  3. 29 Sep, 2006 2 commits
    • unknown's avatar
      Fixed bug#20825: rollup puts non-equal values together · da9f990b
      unknown authored
      Fix for bug 7894 replaces a field(s) in a non-aggregate function with a item
      reference if such a field was specified in the GROUP BY clause in order to
      get a correct result.
      When ROLLUP is involved this lead to a wrong result due to value of a such
      field is got through a copy function and copying happens after the function
      evaluation.
      Such replacement isn't needed if grouping is also done by such a function.
      
      The change_group_ref() function now isn't called for a function present in
      the group list.
      
      
      mysql-test/t/olap.test:
        Added the test case for the bug#20825:  rollup puts non-equal values together
      mysql-test/r/olap.result:
        Added the test case for the bug#20825:  rollup puts non-equal values together
      sql/sql_select.cc:
        Fixed bug#20825: rollup puts non-equal values together
        The change_group_ref() function now isn't called for a function present in
        the group list.
      da9f990b
    • unknown's avatar
      bug #21888 (Query on GEOMETRY field crashes the server) · 01fe277c
      unknown authored
      RTree keys are really different from BTree and need specific
      paramters to be set by optimizer to work.
      Sometimes optimizer doesn't set those properly.
      Here we decided just to add code to check that the parameters
      are correct. Hope to fix optimizer sometimes.
      
      
      myisam/mi_range.c:
        return the error if min_key is NULL
      mysql-test/r/gis-rtree.result:
        test result
      mysql-test/t/gis-rtree.test:
        test case
      01fe277c
  4. 28 Sep, 2006 1 commit
  5. 27 Sep, 2006 2 commits
  6. 25 Sep, 2006 3 commits
  7. 24 Sep, 2006 1 commit
    • unknown's avatar
      mysql_config.sh: · 103fc806
      unknown authored
        Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
        Filter out icc specific options from cflags/libs(_r)
      
      
      scripts/mysql_config.sh:
        Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
      103fc806
  8. 23 Sep, 2006 2 commits
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 1e84e31c
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      1e84e31c
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 14ad51e0
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      14ad51e0
  9. 21 Sep, 2006 2 commits
  10. 20 Sep, 2006 3 commits
    • unknown's avatar
      Fixed bug #20108. · 0f50a8a7
      unknown authored
      Any default value for a enum fields over UCS2 charsets was corrupted
      when we put it into the frm file, as it had been overwritten by its
      HEX representation.
      To fix it now we save a copy of structure that represents the enum
      type and when putting the default values we use this copy. 
      
      
      mysql-test/r/ctype_ucs.result:
        Added a test case for bug #20108.
      mysql-test/t/ctype_ucs.test:
        Added a test case for bug #20108.
      0f50a8a7
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 941e5020
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      941e5020
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · f6951675
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      f6951675
  11. 19 Sep, 2006 2 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 903fc561
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-4.1-opt
      
      
      903fc561
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0 · 82a72ee1
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      myisam/mi_rkey.c:
        Manual null merge as a better fix is already present.
      mysql-test/r/myisam.result:
        Manual null merge as a better fix is already present.
      mysql-test/t/myisam.test:
        Manual null merge as a better fix is already present.
      sql/sql_select.cc:
        Manual merge of purify improvements.
      82a72ee1
  12. 18 Sep, 2006 2 commits
  13. 16 Sep, 2006 1 commit
    • unknown's avatar
      Fixed bug #22085: Crash on the execution of a prepared · c46151d9
      unknown authored
      statement that uses an aggregating IN subquery with 
      HAVING clause.
      A wrong order of the call of split_sum_func2 for the HAVING
      clause of the subquery and the transformation for the 
      subquery resulted in the creation of a andor structure
      that could not be restored at an execution of the prepared
      statement.
      
      
      mysql-test/r/ps.result:
        Added a test cases for bug #22085.
      mysql-test/t/ps.test:
        Added a test cases for bug #22085.
      c46151d9
  14. 15 Sep, 2006 3 commits
  15. 14 Sep, 2006 4 commits
  16. 12 Sep, 2006 2 commits
    • unknown's avatar
      item_cmpfunc.cc: · f3e83870
      unknown authored
        Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
      query_cache.result:
        Corrected a test case after removing a fix for bug#16377
      
      
      mysql-test/r/query_cache.result:
        Corrected a test case after removing a fix for bug#16377
      sql/item_cmpfunc.cc:
        Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
      f3e83870
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 562763f1
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge
      562763f1
  17. 11 Sep, 2006 1 commit
  18. 08 Sep, 2006 1 commit
    • unknown's avatar
      Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES · 54caf667
      unknown authored
       VALUES() was considered a constant. This caused replacing 
       (or pre-calculating) it using uninitialized values before the actual
       execution takes place.
       Mark it as a non-constant (still not dependent of tables) to prevent
       the pre-calculation.
      
      
      mysql-test/r/insert_update.result:
        Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
         - test case.
         - EXPLAIN output changed due to VALUES() not being considered a constant 
           anymore
      mysql-test/t/insert_update.test:
        Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
         - test case.
      sql/item.h:
        Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
         - mark Item_insert_value as non-constant to prevent early calculation.
      54caf667
  19. 07 Sep, 2006 3 commits
    • unknown's avatar
      query_cache.result, func_time.test, type_date.result, func_time.result: · aa840645
      unknown authored
        Corrected test case after removal of fix for bug#16377         
      type_date.test:
        Corrected test case after removal of fix for bug#16377
      item_cmpfunc.cc:
        Removed changes to the agg_cmp_type() made in the for bug#16377
      
      
      mysql-test/t/type_date.test:
        Corrected test case after removal of fix for bug#16377
      mysql-test/t/func_time.test:
        Corrected test case after removal of fix for bug#16377
      mysql-test/r/type_date.result:
        Corrected test case after removal of fix for bug#16377
      mysql-test/r/query_cache.result:
        Corrected test case after removal of fix for bug#16377
      mysql-test/r/func_time.result:
        Corrected test case after removal of fix for bug#16377
      sql/item_cmpfunc.cc:
        Removed changes to the agg_cmp_type() made in the for bug#16377
      aa840645
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.0-bug14400 · 203d0999
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      203d0999
    • unknown's avatar
      Bug#14400 - Query joins wrong rows from table which is subject of · 71314617
      unknown authored
                  "concurrent insert"
      Additional fix for full keys and test case.
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional fix for full keys.
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional results.
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional test case.
      71314617
  20. 06 Sep, 2006 1 commit
  21. 05 Sep, 2006 1 commit