1. 11 Dec, 2007 1 commit
  2. 10 Dec, 2007 5 commits
  3. 07 Dec, 2007 5 commits
  4. 06 Dec, 2007 2 commits
  5. 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
  6. 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
  7. 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
  8. 30 Nov, 2007 9 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
    • unknown's avatar
      Bug #32219: too many hosts in default grant tables 6.0.3 · 3308d879
      unknown authored
      Fix is to remove any references to the current hostname when running
      mysql_install_db --cross-bootstrap.  (The dist-hook make target makes
      this call, and the resulting data directory is included in the source
      distribution as win/data/*.)
      
      Also, a few other clean-ups to mysql_install_db while there.
      
      
      Makefile.am:
        Adapt to clean-up in mysql_install_db (--windows becomes --cross-bootstrap)
      scripts/mysql_install_db.sh:
        Filter out references to the current hostname when performing
        a cross-bootstrap installation by removing any lines which
        contain the string "@current_hostname".
        
        Deprecate the old --windows option; use --cross-bootstrap
        instead, since it more accurately reflects the purpose.
        
        Other clean-up: the wrong syntax was being used to test the
        exit status of mysqld --bootstrap.  It mostly worked, as long
        as mysqld succeeded.  However, it was not robust.
      scripts/mysql_system_tables_data.sql:
        Rename local @hostname variable to @current_hostname, which is a more
        unique label to search on.  mysql_install_db now filters out all
        lines which include "@current_hostname" during a --cross-bootstrap
        installation.
      3308d879
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-build · 8ffb5404
      unknown authored
      into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
      
      
      include/my_global.h:
        Auto merged
      8ffb5404
    • unknown's avatar
      my_global.h: · 44ebdc09
      unknown authored
        Added 64 bit Mac OS X hard coded settings, for universal binaries
      
      
      include/my_global.h:
        Added 64 bit Mac OS X hard coded settings, for universal binaries
      44ebdc09
    • unknown's avatar
  9. 29 Nov, 2007 4 commits
  10. 28 Nov, 2007 3 commits
    • unknown's avatar
      Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base · 21fd6c0f
      unknown authored
      into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      sql-common/client.c:
        Auto merged
      21fd6c0f
    • unknown's avatar
      Merge mysql.com:/Users/davi/mysql/bugs/31479-5.0 · aea86c66
      unknown authored
      into  mysql.com:/Users/davi/mysql/mysql-5.0-runtime
      
      
      aea86c66
    • unknown's avatar
      Bug#31479 Bad lock interaction if CREATE TABLE LIKE is killed · 4b002635
      unknown authored
      Kill of a CREATE TABLE source_table LIKE statement waiting for a
      name-lock on the source table causes a bad lock interaction.
      
      The mysql_create_like_table() has a bug that if the connection is
      killed while waiting for the name-lock on the source table, it will
      jump to the wrong error path and try to unlock the source table and
      LOCK_open, but both weren't locked.
      
      The solution is to simple return when the name lock request is killed,
      it's safe to do so because no lock was acquired and no cleanup is needed.
      
      Original bug report also contains description of other problems
      related to this scenario but they either already fixed in 5.1 or
      will be addressed separately (see bug report for details).
      
      
      mysql-test/r/lock_multi.result:
        Add test case result for Bug#31479
      mysql-test/t/lock_multi.test:
        Add test case for Bug#31479
      sql/sql_table.cc:
        Rerturn TRUE when the lock gets killed.
      4b002635