1. 29 Sep, 2005 15 commits
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · b65c76cb
      unknown authored
      into  hundin.mysql.fi:/home/jan/mysql-5.0
      
      
      b65c76cb
    • unknown's avatar
      Fix incorrectly merged changeset, these may not be before a first 5.0 test · 811d98ad
      unknown authored
      i.e. range test.
      
      
      811d98ad
    • unknown's avatar
      Merge 127.(none):/home/osku/mysql/5.0/clean · bf7fe05f
      unknown authored
      into  127.(none):/home/osku/mysql/5.0/revcpy
      
      
      bf7fe05f
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3dc93a9c
      unknown authored
      into  hundin.mysql.fi:/home/jan/mysql-5.0
      
      
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      sql/ha_innodb.cc:
        Content merge.
      3dc93a9c
    • unknown's avatar
      InnoDB: Fix potential buffer underflow. · b2d8eb02
      unknown authored
      
      innobase/include/ut0mem.h:
        Add ut_strlcpy_rev.
      innobase/mem/mem0mem.c:
        Use ut_strlcpy_rev instead of buggy own implementation.
      innobase/ut/ut0mem.c:
        Add ut_strlcpy_rev.
      b2d8eb02
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 05bcc7ed
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-5000
      
      
      05bcc7ed
    • unknown's avatar
      Minor corrections to InnoDB function comments · 612b9ceb
      unknown authored
      
      innobase/include/mem0mem.h:
        Correct the comment of mem_heap_create_func().
      innobase/include/mem0mem.ic:
        Correct the comment of mem_heap_create_func().
      sql/ha_innodb.cc:
        Correct comments regarding return value
      612b9ceb
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 34b85dc5
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-5000
      
      
      34b85dc5
    • unknown's avatar
      Fixed a bug checksum table locks the InnoDB table and does not use a · 2c0e2a14
      unknown authored
      consistent read (Bug #12669). This fixes InnoDB part of the bug.
      
      
      mysql-test/r/innodb.result:
        Added results for a checksum test.
      mysql-test/t/innodb.test:
        Addeed a test case for a checksum bug #12669.
      sql/ha_innodb.cc:
        Use consistent read for checksum table.
      2c0e2a14
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · d5c647f2
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      ndb/src/ndbapi/NdbUtil.hpp:
        Auto merged
      d5c647f2
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8864a280
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-move
      
      
      8864a280
    • unknown's avatar
      Moving archive from example to sql. · 5c24a8fe
      unknown authored
      
      sql/ha_archive.h:
        Rename: sql/examples/ha_archive.h -> sql/ha_archive.h
      libmysqld/Makefile.am:
        Moved archive files references
      sql/Makefile.am:
        Moved archive from example to sql
      sql/ha_archive.cc:
        Moved location of prov file.
      sql/handler.cc:
        Moved location from examples to sql
      5c24a8fe
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 66aef256
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      66aef256
    • unknown's avatar
      Merge · 14650d4f
      unknown authored
      
      client/mysqltest.c:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      os2/MySQL-Source.icc:
        Auto merged
      regex/Makefile.am:
        Auto merged
      regex/engine.c:
        Auto merged
      regex/main.c:
        Auto merged
      regex/regerror.c:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      14650d4f
    • unknown's avatar
      Many files: · 72340d67
      unknown authored
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      my_regex.h:
        Rename: regex/regex.h -> regex/my_regex.h
      
      
      client/mysqltest.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      os2/MySQL-Source.icc:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/Makefile.am:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/debug.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/debug.ih:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/engine.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/engine.ih:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/main.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/main.ih:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regcomp.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regerror.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regerror.ih:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/my_regex.h:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regexec.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regfree.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/reginit.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      sql/item_cmpfunc.cc:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      sql/item_cmpfunc.h:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      sql/mysqld.cc:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      72340d67
  2. 28 Sep, 2005 25 commits