1. 05 Oct, 2007 5 commits
  2. 04 Oct, 2007 13 commits
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 49dbbfee
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
      
      49dbbfee
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 1a1a2c99
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
      
      1a1a2c99
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731 · 6d0e074c
      unknown authored
      into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
      
      
      sql/set_var.cc:
        Auto merged
      6d0e074c
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731 · a75d3ad3
      unknown authored
      into  polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysys/my_getopt.c:
        Auto merged
      sql/set_var.cc:
        Auto merged
      mysql-test/t/variables.test:
        Manual merge.
      a75d3ad3
    • unknown's avatar
      Issue a warning if a user sets an option or a variable to a value that is... · 42816b97
      unknown authored
      Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
      
      This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.
      
      
      mysql-test/r/variables.result:
        Fixed the test.
      mysql-test/t/variables.test:
        Fixed the test.
      mysys/my_getopt.c:
        Print a warning to the error log if a user sets an option to a value greater than the option's maximum value.
      sql/set_var.cc:
        Issue an SQL warning if a user assignes a value greater than the variable's maximum value.
      42816b97
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b31070/b31070.5.0 · 53ce766b
      unknown authored
      into  mysql.com:/home/ram/work/b31070/b31070.5.1
      
      
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-euc_kr.c:
        Auto merged
      strings/ctype-gb2312.c:
        Auto merged
      strings/ctype-sjis.c:
        Auto merged
      53ce766b
    • unknown's avatar
      merging: results adjusted · 42c905e4
      unknown authored
      42c905e4
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 449f40d7
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
      
      
      client/mysqldump.c:
        Auto merged
      449f40d7
    • unknown's avatar
      Merge sin.intern.azundris.com:/home/tnurnberg/30444/50-30444 · 36be4e2a
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
      
      
      client/mysqldump.c:
        Auto merged
      36be4e2a
    • unknown's avatar
      Merge sin.intern.azundris.com:/home/tnurnberg/30444/41-30444 · f37fc544
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
      
      
      client/mysqldump.c:
        Auto merged
      f37fc544
    • unknown's avatar
      Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database · 805561e4
      unknown authored
      The combination of --single-transaction and --master-data requires
      START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
      mysqld 4.1 on. When trying this against an older server, print
      diagnostic, then, if --force is not given, abort.
      
      No test-case given since it would require a mysqld < 4.1.
      
      
      client/mysqldump.c:
        Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
        
        The combination of --single-transaction and --master-data requires
        START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
        mysqld 4.1 on. When trying this against an older server, print
        diagnostic, then, if --force is not given, abort.
      805561e4
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b31070/b31070.4.1 · 6c4a485e
      unknown authored
      into  mysql.com:/home/ram/work/b31070/b31070.5.0
      
      
      mysql-test/r/ctype_big5.result:
        Auto merged
      mysql-test/r/ctype_gbk.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-euc_kr.c:
        Auto merged
      strings/ctype-gb2312.c:
        Auto merged
      strings/ctype-sjis.c:
        Auto merged
      BitKeeper/deleted/.del-ctype-cp932.c:
        Auto merged
      6c4a485e
    • unknown's avatar
      Fix for bug #31069: crash in 'sounds like' · b889488a
      unknown authored
      and for bug #31070: crash during conversion of charsets
      
      Problem: passing a 0 byte length string to some my_mb_wc_XXX() 
      functions leads to server crash due to improper argument check.
      
      Fix: properly check arguments passed to my_mb_wc_XXX() functions.
      
      
      mysql-test/include/ctype_common.inc:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test case.
      mysql-test/r/ctype_big5.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_euckr.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_gb2312.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_gbk.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_uca.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      strings/ctype-big5.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-cp932.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-euc_kr.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-gb2312.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-sjis.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      b889488a
  3. 03 Oct, 2007 3 commits
  4. 02 Oct, 2007 8 commits
  5. 28 Sep, 2007 3 commits
  6. 27 Sep, 2007 2 commits
  7. 26 Sep, 2007 3 commits
  8. 25 Sep, 2007 3 commits