1. 13 Dec, 2007 1 commit
  2. 12 Dec, 2007 1 commit
  3. 11 Dec, 2007 5 commits
  4. 10 Dec, 2007 6 commits
  5. 07 Dec, 2007 8 commits
  6. 06 Dec, 2007 3 commits
  7. 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
  8. 02 Dec, 2007 2 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
  9. 01 Dec, 2007 6 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
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · dfde8826
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
      
      
      sql/field.cc:
        Auto merged
      dfde8826
    • unknown's avatar
      Fixed the build failure on Windows. It does not have trunc() defined in... · d8d07eff
      unknown authored
      Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.
      
      
      
      d8d07eff
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 4fc6d3b2
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
      
      
      mysql-test/t/type_float.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      mysql-test/r/insert.result:
        SCCS merged
      mysql-test/t/insert.test:
        SCCS merged
      4fc6d3b2
    • unknown's avatar
      Fix for bug #26788 "mysqld (debug) aborts when inserting specific · 1615f838
      unknown authored
      numbers into char fields" and bug #12860 "Difference in zero padding of
      exponent between Unix and Windows"
      
      Rewrote the code that determines what 'precision' argument should be
      passed to sprintf() to fit the string representation of the input number
      into the field.
      We get finer control over conversion by pre-calculating the exponent, so
      we are able to determine which conversion format, 'e' or 'f', will be
      used by sprintf().
      We also remove the leading zero from the exponent on Windows to make it
      compatible with the sprintf() output on other platforms.
      
      
      mysql-test/r/insert.result:
        Added test cases for bug #26788 and bug #31152.
      mysql-test/t/cast.test:
        Removed --replace_result, since the result is now correct on Windows.
      mysql-test/t/insert.test:
        Added test cases for bug #26788 and bug #31152.
      mysql-test/t/type_float.test:
        Removed --replace_result, since the result is now correct on Windows.
      mysql-test/t/variables.test:
        Removed --replace_result, since the result is now correct on Windows.
      sql/field.cc:
        Rewrote the code that determines what 'precision' argument should be
        passed to sprintf() to fit the string representation of the input number
        into the field.
        We get finer control over conversion by pre-calculating the exponent, so
        we are able to determine which conversion format, 'e' or 'f', will be
        used by sprintf().
      1615f838
  10. 30 Nov, 2007 5 commits
    • unknown's avatar
      Merge four.local.lan:/work/trees/mysql-4.1-build-src-clean · f3514dc3
      unknown authored
      into  four.local.lan:/work/trees/mysql-5.0-build-src-clean
      
      
      f3514dc3
    • unknown's avatar
      Merge four.local.lan:/work/merge/mysql-5.0-dev · c0ce23f8
      unknown authored
      into  four.local.lan:/work/trees/mysql-5.0-build-src-clean
      
      
      c0ce23f8
    • unknown's avatar
      Merge four.local.lan:/work/merge/mysql-4.1-dev · d09dfdab
      unknown authored
      into  four.local.lan:/work/trees/mysql-4.1-build-src-clean
      
      
      d09dfdab
    • unknown's avatar
      Merge four.local.lan:/work/merge/mysql-4.1-dev · 89667ffe
      unknown authored
      into  four.local.lan:/work/merge/mysql-5.0-dev
      
      
      BitKeeper/deleted/.del-disabled.def:
        SCCS merged
      mysql-test/r/rpl000015.result:
        Bug does not apply to 5.0 and up
      mysql-test/t/rpl000015.test:
        Bug does not apply to 5.0 and up.
      89667ffe
    • unknown's avatar
      Fix for · 56b00941
      unknown authored
         Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
      Note:
        This bug does not occur in MySQL 5.0 and up, because
        ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
        The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
        which is set by mysql-test-run.pl.
        mysql-test-run.pl in 4.1 does not set this variable.
        There are two alternatives:
        1) Backport the 5.0 fix for this test including modifications
           to mysql-test-run.pl and mysql-test-run-shell.
           This is a not acceptable impact on an old MySQL version.
        2) Fix the problem different than in 5.0 like in the current
           ChangeSet + do not apply these changes when upmerging to 5.0
      
      
      mysql-test/r/rpl000015.result:
        Updated result
      mysql-test/t/disabled.def:
        Enable rpl000015
      mysql-test/t/rpl000015.test:
        Unify the MASTER_PORT number
      56b00941