1. 16 Jun, 2005 7 commits
  2. 15 Jun, 2005 25 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 634a6beb
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysys/default.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      storage/heap/hp_hash.c:
        Auto merged
      storage/heap/hp_update.c:
        Auto merged
      storage/ndb/include/transporter/TransporterDefinitions.hpp:
        Auto merged
      storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
        Auto merged
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      634a6beb
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · fc465d14
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
      
      
      fc465d14
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8419d747
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
      
      
      8419d747
    • unknown's avatar
      Manual merge · 24de7092
      unknown authored
      
      sql/field.cc:
        Auto merged
      24de7092
    • unknown's avatar
      cast.result, cast.test: · 1575df00
      unknown authored
        Added test case for bug #11283.
      field.h, field.cc:
        Fixed bug #11283: wrong conversion from varchar to decimal.
        Added methods Field_string::val_decimal,
        Field_varstring::val_decimal, Field_blob::val_decimal.
        They are not inherited from the base class Field_longstr
        anymore.
      
      
      sql/field.cc:
        Fixed bug #11283: wrong conversion from varchar to decimal.
        Added methods Field_string::val_decimal,
        Field_varstring::val_decimal, Field_blob::val_decimal.
        They are not inherited from the base class Field_longstr
        anymore.
      sql/field.h:
        Fixed bug #11283: wrong conversion from varchar to decimal.
        Added methods Field_string::val_decimal,
        Field_varstring::val_decimal, Field_blob::val_decimal.
        They are not inherited from the base class Field_longstr
        anymore.
      mysql-test/t/cast.test:
        Added test case for bug #11283.
      mysql-test/r/cast.result:
        Added test case for bug #11283.
      1575df00
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 2ec50db8
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.10632
      
      
      strings/decimal.c:
        Auto merged
      2ec50db8
    • unknown's avatar
      Fix for bug #10632 (CEILING returns wrong result) · df60c7ef
      unknown authored
      
      mysql-test/r/func_math.result:
        test result fixed
      mysql-test/t/func_math.test:
        test case added
      strings/decimal.c:
        handling of round_digit changed - we have to check all the digits after
        the point if round_digit is 0
      df60c7ef
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 04ec8eca
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.10337
      
      
      strings/decimal.c:
        Auto merged
      04ec8eca
    • unknown's avatar
      Fix for bug #10337 (cast(NULL DECIMAL) crashes the server) · e4cdb193
      unknown authored
      
      mysql-test/r/cast.result:
        test result fixed
      mysql-test/t/cast.test:
        test case added
      sql/item_func.cc:
        checks for NULL added
      strings/decimal.c:
        we need to return specified 'scale' for the rounded decimal
      e4cdb193
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7fdcb69b
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      7fdcb69b
    • unknown's avatar
      Added comment after Serg's review · 6393d023
      unknown authored
      6393d023
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · e7a26a13
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      e7a26a13
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 85d688a4
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      85d688a4
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · c813e97c
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      c813e97c
    • unknown's avatar
      join_nested.result, join_nested.test: · ad57284c
      unknown authored
        Added a teast case for bug #11284.
      sql_select.cc:
        Fixed bug #11284.
        Optimization with empty inner table currently cannot be
        used in the case of nested outer join.
      
      
      sql/sql_select.cc:
        Fixed bug #11284.
        Optimization with empty inner table currently cannot be
        used in the case of nested outer join.
      mysql-test/t/join_nested.test:
        Added a teast case for bug #11284.
      ad57284c
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · d925e516
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      d925e516
    • 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
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 749a4e91
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      749a4e91
    • unknown's avatar
    • 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 8 commits