1. 12 Nov, 2007 1 commit
    • unknown's avatar
      Bug#31705 Partitions: crash if varchar length > 65530 · 85d1853e
      unknown authored
      Buffer overflow due to wrong key length in partitioning
      
      Changed to the correct key_length function.
      
      
      sql/opt_range.cc:
        Bug#31705 Partitions: crash if varchar length > 65530
        Problem: buffer overflow due to wrong key-length
        
        Fix: Using correct key_length function
      mysql-test/r/partition_datatype.result:
        Bug#31705 Partitions: crash if varchar length > 65530
        New test-result case for testing all column types
        used in key-partitioning.
        
        (For verifying correct key-length use)
      mysql-test/t/partition_datatype.test:
        Bug#31705 Partitions: crash if varchar length > 65530 
        New test case for testing all column types
        used in key-partitioning.
        
        (For verifying correct key-length used)
      85d1853e
  2. 02 Nov, 2007 3 commits
  3. 01 Nov, 2007 4 commits
  4. 31 Oct, 2007 4 commits
  5. 30 Oct, 2007 5 commits
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-4.1-amain · 967c06df
      unknown authored
      into  stella.local:/home2/mydev/mysql-4.1-axmrg
      
      
      967c06df
    • unknown's avatar
      Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug30296.1 · be9e5213
      unknown authored
      into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug30296.1-merge-5.1
      
      
      be9e5213
    • unknown's avatar
      Post-merge fix · dd3abf50
      unknown authored
      dd3abf50
    • unknown's avatar
      BUG#11392 - fulltext search bug · b698b6fd
      unknown authored
      Fulltext boolean mode phrase search may crash server on platforms
      where size of pointer is not equal to size of unsigned integer
      (in other words some 64-bit platforms).
      
      The problem was integer overflow.
      
      Affects 4.1 only.
      
      
      myisam/ft_boolean_search.c:
        my_match_t::beg is unsigned int, that means type of expression
        (m[0].beg - 1) has unsigned type too. It may happen that instr()
        finds substring in the beggining of passed string, returning
        m[0].beg equal to 0. In this case value of expression (m[0].beg - 1)
        is equal to MAX_UINT.
        
        This is not a problem on platforms where sizeof(pointer) equals to
        sizeof(uint). That means ptr[(uint)-1] = ptr[(uint)MAX_UINT] = ptr - 1.
        
        On some 64-bit platforms where sizeof(pointer) is 8 and sizeof(uint)
        is 4, wrong address gets accessed. In other words ptr[(uint)-1] is
        equal to ptr + MAX_UINT.
      mysql-test/r/fulltext.result:
        A test case for BUG#11392.
      mysql-test/t/fulltext.test:
        A test case for BUG#11392.
      b698b6fd
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-bug4692 · 9fa501f0
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-bug4692
      
      
      mysql-test/r/myisam.result:
        Bug#4692 - DISABLE/ENABLE KEYS waste a space
        Manual merge
      mysql-test/t/myisam.test:
        Bug#4692 - DISABLE/ENABLE KEYS waste a space
        Manual merge
      storage/myisam/mi_check.c:
        Bug#4692 - DISABLE/ENABLE KEYS waste a space
        Manual merge
      9fa501f0
  6. 29 Oct, 2007 1 commit
  7. 26 Oct, 2007 4 commits
    • unknown's avatar
      Bug#4692 - DISABLE/ENABLE KEYS waste a space · 612bedb2
      unknown authored
      Disabling and enabling indexes on a non-empty table grows the
      index file.
      
      Disabling indexes just sets a flag per non-unique index and does not
      free the index blocks of the affected indexes. Re-enabling indexes
      creates new indexes with new blocks. The old blocks remain unused
      in the index file.
      
      Fixed by dropping and re-creating all indexes if non-empty disabled
      indexes exist when enabling indexes. Dropping all indexes resets
      the internal end-of-file marker to the end of the index file header.
      It also clears the root block pointers of every index and clears the
      deleted blocks chains. This way all blocks are declared as free.
      
      
      myisam/mi_check.c:
        Bug#4692 - DISABLE/ENABLE KEYS waste a space
        Added function mi_drop_all_indexes() to support drop of all indexes
        in case we want to re-enable non-empty disabled indexes.
        Changed mi_repair(), mi_repair_by_sort(), and mi_repair_parallel()
        to use the new function instead of duplicate drop index code.
      mysql-test/r/myisam.result:
        Bug#4692 - DISABLE/ENABLE KEYS waste a space
        Added test result.
      mysql-test/t/myisam.test:
        Bug#4692 - DISABLE/ENABLE KEYS waste a space
        Added test.
      612bedb2
    • unknown's avatar
      Bug#30296 · 0bb55050
      unknown authored
        "Dynamic plugins fail to load on FreeBSD"
        ELF executables need to be linked using the -export-dynamic option to
        ld(1) for symbols defined in the executable to become visible to dlsym().
        Also, do not build plugins on an all-static build.
      
      
      configure.in:
        Bug#30296
          Use "-export-dynamic" when building executable for use with plugins.
          Add required option using MYSQLD_EXTRA_LDFLAGS variable so we do not
          affect any other binary.
      config/ac-macros/plugins.m4:
        Do not build plugins when building all-static
      sql/sql_yacc.yy:
        build fix - surplus semicolon
      0bb55050
    • unknown's avatar
      Merge anubis.xiphis.org:/usr/home/antony/work/p1-bug31473.1-backport-5.0 · 66198e09
      unknown authored
      into  anubis.xiphis.org:/usr/home/antony/work/p1-bug31473.1-backport-5.1
      
      
      mysql-test/r/csv.result:
        null merge
      mysql-test/t/csv.test:
        null merge
      66198e09
    • unknown's avatar
      protect bug31473 from regressing into 5.0 · 0724eb88
      unknown authored
      0724eb88
  8. 25 Oct, 2007 2 commits
    • unknown's avatar
      Mimic a rename which Daniel already did in 6.0, · a71a829a
      unknown authored
      to get rid of a name clash among *deleted* files on case-insignificant file systems.
      
      
      BitKeeper/deleted/.del-changelog-bleh:
        Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh
      a71a829a
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines · d0b68a10
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.1-engines
      
      
      include/my_sys.h:
        Use local.
      mysys/charset.c:
        Use local.
      sql/item_func.cc:
        Use local.
      mysql-test/r/ctype_ucs.result:
        SCCS merged
      mysql-test/t/ctype_ucs.test:
        SCCS merged
      d0b68a10
  9. 24 Oct, 2007 4 commits
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines · 22b36705
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysys/charset.c:
        Manual merge.
      sql/item_func.cc:
        Manual merge.
      22b36705
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 4fda18a3
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines
      
      
      4fda18a3
    • unknown's avatar
      BUG#31159 - fulltext search on ucs2 column crashes server · 660d6626
      unknown authored
      ucs2 doesn't provide required by fulltext ctype array. Crash
      happens because fulltext attempts to use unitialized ctype
      array.
      
      Fixed by converting ucs2 fields to compatible utf8 analogue.
      
      
      include/my_sys.h:
        Added a function to find compatible character set with ctype array
        available. Currently used by fulltext search to find compatible
        substitute for ucs2 collations.
      mysql-test/r/ctype_ucs.result:
        A test case for BUG#31159.
      mysql-test/t/ctype_ucs.test:
        A test case for BUG#31159.
      mysys/charset.c:
        Added a function to find compatible character set with ctype array
        available. Currently used by fulltext search to find compatible
        substitute for ucs2 collations.
      sql/item_func.cc:
        Convert ucs2 fields to utf8. Fulltext requires ctype array, but
        ucs2 doesn't provide it.
      660d6626
    • unknown's avatar
      result fix · f78be6c8
      unknown authored
      f78be6c8
  10. 23 Oct, 2007 12 commits
    • unknown's avatar
      Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-engines · 957d8665
      unknown authored
      into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30878
      
      
      mysql-test/r/partition.result:
        Auto merged
      mysql-test/t/partition.test:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      957d8665
    • unknown's avatar
      Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30695 · 2b5bcaab
      unknown authored
      into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30878
      
      
      mysql-test/r/partition.result:
        SCCS merged
      mysql-test/t/partition.test:
        SCCS merged
      2b5bcaab
    • unknown's avatar
      Bug #30695: An apostrophe ' in the comment of the ADD PARTITION · fe784fac
      unknown authored
        causes the Server to crash.
      
      Accessing partitioned table with an apostrophe in partition options
      like DATA DIRECTORY, INDEX DIRECTORY or COMMENT causes server crash.
      
      Partition options were saved in .frm file without escaping.
      When accessing such table it is not possible to properly restore
      partition information.
      Crashed because there was no check for partition info parser failure.
      
      Fixed by escaping quoted text in the partition info when writing it to
      the frm-file and added a check that it was able to parse the partition
      info before using it 
      
      NOTE: If the comment is written by an earlier version of the server,
      the corrupted frm-file is not fixed, but left corrupted, you have to
      manually drop the table and recreate it.
      
      
      mysql-test/r/partition.result:
        bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
        the Server to crash.
         testresult
      mysql-test/t/partition.test:
        bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
        the Server to crash.
          testcase
      sql/sql_partition.cc:
        Bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
          the Server to crash.
        
          Crashes when there is an non escaped apostrophe in the partition options
        
          fixed by escaping quoted text before writing to the frm-file
      sql/table.cc:
        Bug #30695 An apostrophe ' in the comment of the ADD PARTITION
          causes the Server to crash
        
        problem was using a null poiter without check -> crash.
        
        added a check that the previus call succeded
      fe784fac
    • unknown's avatar
      result fix · b987945d
      unknown authored
      b987945d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · e085211d
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        after merge fix
      e085211d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · fa0e1d6b
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      fa0e1d6b
    • unknown's avatar
      after merge fix · 985e4a64
      unknown authored
      985e4a64
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 95a8bb20
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/client_priv.h:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/query_cache.result:
        manual merge
      mysql-test/include/mix1.inc:
        manual merge
      mysql-test/r/innodb_mysql.result:
        manual merge
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/query_cache.test:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      95a8bb20
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8479eb1d
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      8479eb1d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6e8919b0
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      6e8919b0
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c448d2ed
      unknown authored
      into  mysql.com:/home/hf/work/30638/my50-30638
      
      
      c448d2ed
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 72bd96ae
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
      
      
      72bd96ae