An error occurred fetching the project authors.
  1. 17 Jan, 2007 4 commits
  2. 16 Jan, 2007 2 commits
  3. 15 Jan, 2007 4 commits
  4. 11 Jan, 2007 10 commits
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 85cc49ef
      unknown authored
      into  mysql.com:/home/tnurnberg/work/mysql-5.1-maint-24660
      
      
      85cc49ef
    • unknown's avatar
      Revert to old behavior. Including code to verify that a cluster is not · a6df406f
      unknown authored
      readonly seems like a good idea, but the test suite isn't expecting those
      statements in some places.
      
      Figure out how we want to use this code later.
      
      
      mysql-test/include/have_ndb.inc:
        Revert to old behavior.
      a6df406f
    • unknown's avatar
      Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint · 82b24825
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
      
      
      mysys/mf_iocache.c:
        Auto merged
      82b24825
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint · ed20d0e9
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
      
      
      Makefile.am:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      include/mysql.h:
        Auto merged
      include/typelib.h:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/mf_iocache.c:
        Auto merged
      mysys/my_seek.c:
        Auto merged
      mysys/my_wincond.c:
        Auto merged
      mysys/typelib.c:
        Auto merged
      server-tools/instance-manager/guardian.cc:
        Auto merged
      server-tools/instance-manager/instance.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/share/charsets/hebrew.xml:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      strings/conf_to_src.c:
        Auto merged
      vio/viossl.c:
        Auto merged
      ed20d0e9
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint · 32b14754
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
      
      
      mysys/mf_iocache.c:
        Auto merged
      mysys/my_read.c:
        Auto merged
      mysys/my_seek.c:
        null merge
      32b14754
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint · 9397ff2a
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
      
      
      mysys/mf_iocache.c:
        Auto merged
      mysys/my_read.c:
        Auto merged
      mysys/my_seek.c:
        Auto merged
      9397ff2a
    • unknown's avatar
      Merge naruto.:C:/cpp/bug24751/my51-bug24751 · 8aa8dd0e
      unknown authored
      into  naruto.:C:/cpp/mysql-5.1-maint
      
      
      mysys/mf_iocache.c:
        Auto merged
      8aa8dd0e
    • unknown's avatar
      Merge naruto.:C:/cpp/bug24751/my50-bug24751 · c3f67752
      unknown authored
      into  naruto.:C:/cpp/bug24751/my51-bug24751
      
      
      mysys/mf_iocache.c:
        Auto merged
      c3f67752
    • unknown's avatar
      Merge naruto.:C:/cpp/bug24751/my41-bug24751 · 029d6cf9
      unknown authored
      into  naruto.:C:/cpp/bug24751/my50-bug24751
      
      
      mysys/mf_iocache.c:
        Auto merged
      029d6cf9
    • unknown's avatar
      Bug#24751 - Possible infinit loop in init_io_cache() when insufficient memory · 2cbccbfb
      unknown authored
      - When cache memory can't be allocated size is recaclulated using 3/4 of
        the requested memory. This number is rounded up to the nearest 
        min_cache step. 
        However with the previous implementation the new cache size might
        become bigger than requested because of this rounding and thus we get
        an infinit loop.
      - This patch fixes this problem by ensuring that the new cache size
        always will be smaller on the second and subsequent iterations until
        we reach min_cache.
      
      
      mysys/mf_iocache.c:
        - Added mask to cachesize to ensure that algorithm always produce a 
          smaller cache size than current, until we reach 'min_cache' size.
      2cbccbfb
  5. 09 Jan, 2007 6 commits
    • unknown's avatar
      Bug#24660: "enum" field type definition problem · be32c011
      unknown authored
      ENUMs weren't allowed to have character 0xff, a perfectly good character in many locales.
      This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
      being used (because they too would get converted to 0xff on load). Now if 0xff makes an
      appearance, we find a character not used in the enum and use that as a separator. If no
      such character exists, we throw an error.
      
      Any solution would have broken some sort of existing behaviour. This solution should
      serve both fractions (those with 0xff and those with ',' in their enums), but
      WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
      That is, mysqldump with their current server, and restore when upgrading to one with
      this patch.
      
      (port of the original 4.1 patch. incorporates some suggestions by kaamos.)
      
      
      mysql-test/r/type_enum.result:
        Bug#24660: "enum" field type definition problem
        
        Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
        char in some locales), or ',', or both.
      mysql-test/t/type_enum.test:
        Bug#24660: "enum" field type definition problem
        
        Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
        char in some locales), or ',', or both.
      sql/table.cc:
        Bug#24660: "enum" field type definition problem
        
        Revert fix for Bug#20922.
      sql/unireg.cc:
        Bug#24660: "enum" field type definition problem
        
        Use a field-separator for ENUM-values that is not part of those values. If impossible,
        throw error.
      be32c011
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010 · 2cbc02f3
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
      
      
      2cbc02f3
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010 · 3a879e76
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010
      
      
      mysys/mf_iocache.c:
        Auto merged
      mysys/my_seek.c:
        SCCS merged
      3a879e76
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my41-bug23010 · 72268a3b
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010
      
      
      mysys/mf_iocache.c:
        Auto merged
      mysys/my_seek.c:
        Auto merged
      72268a3b
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 · 7b95184a
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/bug23010/my41-fix23010
      
      
      mysys/mf_iocache.c:
        Auto merged
      mysys/my_seek.c:
        Auto merged
      7b95184a
    • unknown's avatar
      Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628 · d7e9fd07
      unknown authored
      mysys/mf_iocache.c:
        Exclude
      mysys/my_seek.c:
        Exclude
      d7e9fd07
  6. 07 Jan, 2007 2 commits
    • unknown's avatar
      Post-merge cleanup and fix minor BUILD/... "="-equality syntax · 4d106e4c
      unknown authored
      error.
      
      
      BUILD/SETUP.sh:
        Use POSIX "=" equality shell test.
      mysql-test/r/view.result:
        Revert year drift.
      4d106e4c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0517aa59
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
      
      
      Makefile.am:
        Auto merged
      configure.in:
        Auto merged
      include/mysql.h:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      scripts/mysqlbug.sh:
        Auto merged
      server-tools/instance-manager/Makefile.am:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      mysql-test/r/warnings.result:
        Manual merge.
      mysql-test/t/warnings.test:
        Manual merge.
      strings/ctype-extra.c:
        Manual merge.
      0517aa59
  7. 06 Jan, 2007 5 commits
  8. 04 Jan, 2007 4 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · c56c14f5
      unknown authored
      into  zim.(none):/home/brian/mysql/merge-5.1
      
      
      c56c14f5
    • unknown's avatar
      The CSV format has always relied on numbers being quoted, which doesn't always... · 8bd11441
      unknown authored
      The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space). 
      
      
      mysql-test/r/csv.result:
        Fixed test case for format change. Added new test for floating point numbers.
      mysql-test/t/csv.test:
        Fixed test for format change. Added test case for floating point numbers.
      storage/csv/ha_tina.cc:
        Updated code to handle numbers as raw unquotes types in CSV
      8bd11441
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 967b38a4
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      storage/csv/CMakeLists.txt:
        Auto merged
      storage/csv/Makefile.am:
        Auto merged
      967b38a4
    • unknown's avatar
      Split out the hidden class from the ha_tina file (probably should have just... · 20f0c7a6
      unknown authored
      Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better. 
      
      
      storage/csv/transparent_file.cc:
        BitKeeper file /home/brian/mysql/merge-5.1/storage/csv/transparent_file.cc
      storage/csv/transparent_file.h:
        BitKeeper file /home/brian/mysql/merge-5.1/storage/csv/transparent_file.h
      storage/csv/CMakeLists.txt:
        Updated for windows
      storage/csv/Makefile.am:
        Updated to add new class
      storage/csv/ha_tina.cc:
        Removed hidden class
      storage/csv/ha_tina.h:
        Remove hidden class
      20f0c7a6
  9. 02 Jan, 2007 3 commits