1. 22 Feb, 2008 4 commits
  2. 19 Feb, 2008 3 commits
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug31236/my51-bug31236 · 173efef4
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      configure.in:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/unireg.h:
        Auto merged
      173efef4
    • unknown's avatar
      Fix for bug #31236: Inconsistent division by zero behavior for · 61c31af4
      unknown authored
                          floating point numbers
      
      Some math functions did not check if the result is a valid number
      (i.e. neither of +-inf or nan).
      
      Fixed by validating the result where necessary and returning NULL in
      case of invalid result.
      
      
      BitKeeper/deleted/.del-matherr.c:
        Rename: sql/matherr.c -> BitKeeper/deleted/.del-matherr.c
      configure.in:
        Removed DONT_USE_FINITE, it is not used anywhere.
      include/my_global.h:
        isfinite() is a C99 macro which absoletes finite(). First try to use
        it, then fall back to finite() if the target platform has it,
        otherwise use our own implementation.
      mysql-test/r/func_math.result:
        Added a test case for bug #31236.
      mysql-test/r/strict.result:
        Fixed a test case which relied on old behavior.
      mysql-test/t/func_math.test:
        Added a test case for bug #31236.
      mysql-test/t/strict.test:
        Fixed a test case which relied on old behavior.
      sql/field.cc:
        No need to check if the finite() or its equivalent is available.
      sql/item_func.cc:
        Use fix_result() wherever the result can be one of +-inf or nan, 
        assuming the function arguments are valid numbers.
        Removed fix_result() from functions that are defined for all possible
        input numbers.
      sql/item_func.h:
        Moved fix_result() from Item_dec_func to Item_func which is a common
        ancestor for Item_dec_func and Item_num_op.
      sql/unireg.h:
        Removed POSTFIX_ERROR because no code returns it.
      61c31af4
    • unknown's avatar
      Bug #30604: different flagging of time_zone_used in normal · 1ac31924
      unknown authored
        and ps-protocol
      Finding a routine should be a transparent operation as 
      far as the binary log is concerned.
      But it was influencing the binary log because of the TIMESTAMP
      column in the proc table.
      
      Fixed by preserving and restoring the time_zone usage flag when
      searching for a stored routine in the proc table.
      
      
      mysql-test/r/binlog_innodb.result:
        Bug #30604: test case
      mysql-test/r/ctype_cp932_binlog.result:
        Bug #30604: updated test results (a procedure call before that)
      mysql-test/t/binlog_innodb.test:
        Bug #30604: test case
      sql/sp.cc:
        Bug #30604: finding a routine should be a transparent operation as 
        far as the binary log is concerned.
        Fixed by preserving and restoring the time_zone usage flag.
      1ac31924
  3. 18 Feb, 2008 8 commits
  4. 17 Feb, 2008 10 commits
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 9b9f08e7
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      9b9f08e7
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 02e7537f
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/item.cc:
        SCCS merged
      02e7537f
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 787dbaca
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      sql/item.cc:
        Auto merged
      787dbaca
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 1e62af86
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/sp.result:
        Null merge.
      mysql-test/t/sp.test:
        Null merge.
      1e62af86
    • unknown's avatar
      Post-merge fix. · e3180667
      unknown authored
      e3180667
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.1 · 695865fe
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_ndb_charset.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_row_charset.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_row_charset.test:
        Auto merged
      BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Manual merge.
      mysql-test/r/sp.result:
        Manual merge.
      695865fe
    • unknown's avatar
      Bug #32942 now() - interval '7200' second NOT pre-calculated, causing "full table scan" · d6be1a9b
      unknown authored
      Problem is not about intervals and doesn't actually cause 'full table scan'.
      We have an optimization for DISTINCT when we have
      'DISTINCT field_from_first_join_table' we don't need to read all the
      rows from the JOIN-ed table if we found one conforming row.
      It stopped working in 5.0 as we return NESTED_LOOP_OK if we came upon
      that case in the evaluate_join_record() and that doesn't break the
      recordreading loop in sub_select().
      
      Fixed by returning NESTED_LOOP_NO_MORE_ROWS in this case.
      
      
      mysql-test/r/select.result:
        Bug #32942 now() - interval '7200' second is NOT pre-calculated, causing "full table scan".
        
        test result
      mysql-test/t/select.test:
        Bug #32942 now() - interval '7200' second is NOT pre-calculated, causing "full table scan"
        
        test case
      sql/sql_select.cc:
        Bug #32942 now() - interval '7200' second NOT pre-calculated, causing "full table scan"
        
        return NESTED_LOOP_NO_MORE_ROWS when we don't need to read rows from
        this table anymore
      d6be1a9b
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · b546edb4
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      b546edb4
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.0 · 4a834b4b
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/sp.result:
        Manual merge.
      mysql-test/t/sp.test:
        Manual merge.
      4a834b4b
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-4.1 · f364c099
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-4.1-opt
      
      
      f364c099
  5. 16 Feb, 2008 2 commits
  6. 15 Feb, 2008 3 commits
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 0529125a
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B31887-5.0-opt
      
      
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      0529125a
    • unknown's avatar
      Bug #31887: DML Select statement not returning same results · cc2e929a
      unknown authored
      when executed in version 5
      
      Zero fill is a field attribute only. So we can't always 
      propagate  constants for zerofill fields : the values and 
      expression results don't have that flag.
      
      Fixed by converting the const value to a string and 
      using that in const propagation when the context allows it. 
      Disable const propagation for fields with ZEROFILL flag in
      all the other cases.
      
      
      mysql-test/r/compare.result:
        Bug #31887: test case
      mysql-test/t/compare.test:
        Bug #31887: test case
      sql/item.cc:
        Bug #31887: If the context allows conversion
        of an int constant to a zero-filled string constant
        put the string constant instead of the int constant
        when doing const propagation
      sql/mysql_priv.h:
        Bug #31887: a macro to get all the Field_num
        descendant fields.
      cc2e929a
    • unknown's avatar
      Adding waits to events_scheduling to prevent the test from · 410e2d64
      unknown authored
      failing on heavily loaded systems.
      
      
      mysql-test/t/events_scheduling.test:
        Adding waits before statements since the scheduler is unpredictable
        on loaded systems and might be delayed.
      410e2d64
  7. 14 Feb, 2008 6 commits
  8. 13 Feb, 2008 4 commits