1. 13 Dec, 2007 6 commits
    • unknown's avatar
      after merge fix · f1d98054
      unknown authored
      f1d98054
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 4618000b
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      include/mysql_com.h:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      4618000b
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 33f82b17
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/CMakeLists.txt:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      mysql-test/r/delayed.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/func_misc.result:
        manual merge
      mysql-test/r/innodb_mysql.result:
        manual merge
      mysql-test/t/func_misc.test:
        manual merge
      mysql-test/t/innodb_mysql.test:
        manual merge
      sql/sql_insert.cc:
        manual merge
      33f82b17
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 196f0c75
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug32198
      
      
      196f0c75
    • unknown's avatar
      BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly · c6675cd1
      unknown authored
      - Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable
      
      
      mysql-test/r/range.result:
        BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
        - Testcase
      mysql-test/t/range.test:
        BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
        - Testcase
      sql/field.cc:
        BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
        - Added comments
      c6675cd1
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 618cb7a8
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
      
      
      include/mysql_com.h:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      618cb7a8
  2. 12 Dec, 2007 1 commit
  3. 11 Dec, 2007 3 commits
  4. 10 Dec, 2007 4 commits
  5. 09 Dec, 2007 2 commits
  6. 08 Dec, 2007 4 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · b3f11ed4
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug32815
      
      
      b3f11ed4
    • unknown's avatar
      Fix for BUG#32694 "NOT NULL table field in a subquery produces invalid results" · b3d8ff4e
      unknown authored
        
      The problem was that when convert_constant_item is called for subqueries,
      this happens when we already started executing the top-level query, and
      the field argument of convert_constant_item pointed to a valid table row.
      In turn convert_constant_item used the field buffer to compute the value
      of its item argument. This copied the item's value into the field,
      and made equalities with outer references always true.
        
      The fix saves/restores the original field's value when it belongs to an
      outer table.
      
      
      mysql-test/r/type_datetime.result:
        Test for BUG#32694.
      mysql-test/t/type_datetime.test:
        Test for BUG#32694.
      sql/item_cmpfunc.cc:
        - Changed convert_constant_item() so that it doesn't destroy the contents
          of its field argument when the field originates from table in an outer
          query.
      b3d8ff4e
    • unknown's avatar
      Fixed bug #27545. · b1b2e0d0
      unknown authored
      Both arguments of the function NAME_CONST must be constant expressions.
      This constraint is checked in the Item_name_const::fix_fields method. 
      Yet if the argument of the function was not a constant expression no
      error message was reported. As a result the client hanged waiting for a
      response.
      Now the function Item_name_const::fix_fields reports an error message
      when any of the additional context conditions imposed on the function
      NAME_CONST is not satisfied. 
      
      
      mysql-test/r/func_misc.result:
        Added a test case for bug #26545.
      mysql-test/t/func_misc.test:
        Added a test case for bug #26545.
      b1b2e0d0
    • unknown's avatar
      Fixed bug #32815. · d776054e
      unknown authored
      The index (key_part_1, key_part-2) was erroneously considered as compatible
      with the required ordering in the function test_test_if_order_by_key when 
      a query with an ORDER BY clause contained a condition of the form
        key_part_1=const OR key_part_1 IS NULL 
      and the order list contained only key_part_2. This happened because the value
      of the const_key_parts field in the KEYUSE structure was not formed correctly
      for the keys that could be used for ref_or_null access. 
      This was fixed in the code of the update_ref_and_keys function.
      The problem could not manifest itself for MyISAM databases because the
      implementation of the keys_to_use_for_scanning() handler function always
      returns an empty bitmap for the MyISAM engine.
      
      
      mysql-test/r/innodb_mysql.result:
        Added a test case for bug #32815.
      mysql-test/t/innodb_mysql.test:
        Added a test case for bug #32815.
      sql/sql_select.cc:
        Fixed bug #32815.
        The index (key_part_1, key_part-2) was erroneously considered as compatible
        with the required ordering in the function test_test_if_order_by_key when 
        a query with an ORDER BY clause contained a condition of the form
          key_part_1=const OR key_part_1 IS NULL 
        and the order list contained only key_part_2. This happened because the value
        of the const_key_parts field in the KEYUSE structure was not formed correctly
        for the keys that could be used for ref_or_null access. 
        This was fixed in the code of the update_ref_and_keys function.
      d776054e
  7. 07 Dec, 2007 5 commits
  8. 06 Dec, 2007 4 commits
    • unknown's avatar
      Fix compiler warning about wrong integer size (probably harmless) · 2632dbf6
      unknown authored
      
      sql/sql_select.cc:
        Fix compiler warning (probably harmless, wrong integer size)
      2632dbf6
    • unknown's avatar
      ctype-simple.c: Backport quick fix to remove Windows compiler warnings · 18d14b3a
      unknown authored
      
      strings/ctype-simple.c:
        Backport quick fix to remove Windows compiler warnings.
      18d14b3a
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bfe58b71
      unknown authored
      into  mysql.com:/misc/mysql/31177/50-31177
      
      
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      bfe58b71
    • unknown's avatar
      Bug#31177: Server variables can't be set to their current values · 4618d68d
      unknown authored
      additional fixes for BDB and correct assignment of both signed
      and unsigned 64-bit data to unsigned system variables
      
      
      mysql-test/r/ps_2myisam.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_3innodb.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_4heap.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_5merge.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_6bdb.result:
        account for UNSIGNED_FLAG
      mysql-test/r/ps_7ndb.result:
        account for UNSIGNED_FLAG
      mysys/my_getopt.c:
        We have correct signed/unsigned information now, so we no longer
        need to err on the side of caution.
      sql/item_func.cc:
        Copy unsigned info over from entry so the item's data
        correctly describe it.
      sql/mysqld.cc:
        BDB log buffer size: default can't be less than minimum
      sql/set_var.cc:
        Handle signedness of in-values correctly when assigning to
        unsigned types, all the way up to 64-bit. Use handler from
        all three unsigned sysvar types.
      sql/set_var.h:
        thd_ulonglong: Override default check with one for unsigned types
      4618d68d
  9. 05 Dec, 2007 3 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · a9383147
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/set_var.cc:
        Auto merged
      a9383147
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 55a420e1
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      client/mysqldump.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysql/CMakeLists.txt:
        Auto merged
      libmysql/Makefile.shared:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Manual merge
      mysql-test/r/ctype_ucs.result:
        Manual merge
      mysql-test/r/func_misc.result:
        Manual merge
      mysql-test/t/binlog_killed.test:
        Manual merge
      mysql-test/t/ctype_ucs.test:
        Manual merge
      mysql-test/t/func_misc.test:
        Manual merge
      sql/item_strfunc.h:
        Manual merge
      strings/ctype-simple.c:
        Manual merge
      55a420e1
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9f26f5c0
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
      
      
      sql/set_var.cc:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Manual merge
      mysql-test/t/ctype_ucs.test:
        Manual merge
      9f26f5c0
  10. 04 Dec, 2007 1 commit
  11. 03 Dec, 2007 2 commits
    • unknown's avatar
      Bug#30234: Unexpected behavior using DELETE with AS and USING · b4a146a6
      unknown authored
      Anti-patch. This patch undoes the previously pushed patch. It is 
      null-merged in versions 5.1 and above since there the original 
      patch is still desired.
      
      
      mysql-test/r/delete.result:
        Bug#30234: Anti-patch
      mysql-test/t/delete.test:
        Bug#30234: Anti-patch
      sql/sql_yacc.yy:
        Bug#30234: Anti-patch
      b4a146a6
    • unknown's avatar
      Bug#31177: Server variables can't be set to their current values · 53f7db28
      unknown authored
      additional fixes for 64-bit
      
      
      mysql-test/t/variables.test:
        replace 32-bit and 64-bit values
      mysys/my_getopt.c:
        'mod' no longer used.
        on 64-bit, limit to (signed) (LONG)LONG_MAX to prevent badness
        in classes using longlong.
      53f7db28
  12. 02 Dec, 2007 3 commits
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 416e1d9d
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
      
      
      mysql-test/t/insert.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      416e1d9d
    • unknown's avatar
      Windows-specific fixes in floating point tests. · 5fd87aba
      unknown authored
      
      mysql-test/t/insert.test:
        Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result
      mysql-test/t/variables.test:
        We need to do replace_result because variables are printed by another procedure.
      sql/field.cc:
        Fixed the code to limit the precision to DBL_DIG.
      5fd87aba
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 6a72267d
      unknown authored
      into  mysql.com:/misc/mysql/31177/50-31177
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      6a72267d
  13. 01 Dec, 2007 2 commits
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 187cfae6
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
      
      
      mysql-test/r/insert.result:
        Auto merged
      mysql-test/t/insert.test:
        Auto merged
      sql/field.cc:
        Auto merged
      187cfae6
    • unknown's avatar
      Fixed the floating point number tests on Windows. · 1f22720c
      unknown authored
      
      mysql-test/r/insert.result:
        Fixed the test cases.
      mysql-test/t/cast.test:
        We need to do replace_result because warnings are printed by another procedure.
      mysql-test/t/insert.test:
        Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result.
      sql/field.cc:
        Limit the precision to avoid garbage past the significant digits.
      1f22720c