1. 03 Jan, 2005 11 commits
  2. 02 Jan, 2005 6 commits
  3. 01 Jan, 2005 6 commits
    • unknown's avatar
      Fixed failed merge · 4923ac5c
      unknown authored
      4923ac5c
    • unknown's avatar
      Fixed failed merge · 509c8c22
      unknown authored
      509c8c22
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 45bc342a
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      45bc342a
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8bb5133a
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      8bb5133a
    • unknown's avatar
      mysql-test-run.pl: · de4853c3
      unknown authored
        Added --ps-protocol and --embedded-server
      
      
      mysql-test/mysql-test-run.pl:
        Added --ps-protocol and --embedded-server
      de4853c3
    • unknown's avatar
      log0recv.c: · dee1ccd4
      unknown authored
        Fix a wrong memset in InnoDB Hot Backup code; the bug probably did not affect anything since we do not assume that the header of a log file is filled with zeros before writing the header info there; the bug found by Felix von Leitner
      
      
      innobase/log/log0recv.c:
        Fix a wrong memset in InnoDB Hot Backup code; the bug probably did not affect anything since we do not assume that the header of a log file is filled with zeros before writing the header info there; the bug found by Felix von Leitner
      dee1ccd4
  4. 31 Dec, 2004 13 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5be05aa7
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      5be05aa7
    • unknown's avatar
      row0upd.c: · 89ae5766
      unknown authored
        Fix a little bug in InnoDB: we looked at the physical size of a stored SQL NULL value from a wrong field in the index; this has probably caused no bugs visible to the user, only caused some extra space usage in some rare cases; we may later backport the fix to 4.0
      
      
      innobase/row/row0upd.c:
        Fix a little bug in InnoDB: we looked at the physical size of a stored SQL NULL value from a wrong field in the index; this has probably caused no bugs visible to the user, only caused some extra space usage in some rare cases; we may later backport the fix to 4.0
      89ae5766
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7a906517
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      7a906517
    • unknown's avatar
      - updated compile-dist to include NDB cluster · 03b9c209
      unknown authored
      
      BUILD/compile-dist:
        - make sure to include NDB cluster in the distribution, too
      03b9c209
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.0 · b92b213f
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      Build-tools/Bootstrap:
        Auto merged
      b92b213f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 8bf40217
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
      
      8bf40217
    • unknown's avatar
      - Bootrap now uses "compile-dist" by default to create the source distribution · dc7d8c76
      unknown authored
      
      Build-tools/Bootstrap:
        - Use BUILD/compile-dist instead of compile-pentium-max
        - some minor cleanups
      dc7d8c76
    • unknown's avatar
      post-merge · 64845029
      unknown authored
      
      mysql-test/r/grant2.result:
        new test case
      mysql-test/r/variables.result:
        don't fail w/o innodb
      mysql-test/t/grant2.test:
        new test case
      mysql-test/t/multi_update.test:
        don't fail w/o innodb
      mysql-test/t/variables.test:
        don't fail w/o innodb
      sql/sql_acl.cc:
        cleanup
      64845029
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 71ac38b1
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      71ac38b1
    • unknown's avatar
      Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag · 9ceb74f5
      unknown authored
      This allows use to use INSERT IGNORE ... ON DUPLICATE ...
      
      
      mysql-test/r/drop.result:
        safety fix
      mysql-test/t/drop.test:
        safety fix
      mysql-test/t/multi_update.test:
        ensure we cover all possible errors
      sql/log_event.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/log_event.h:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/mysql_priv.h:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_class.h:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_delete.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_insert.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_lex.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_lex.h:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_load.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_parse.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_repl.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_repl.h:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_select.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_table.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_union.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_update.cc:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      sql/sql_yacc.yy:
        Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
      9ceb74f5
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · d105391b
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      d105391b
    • unknown's avatar
      - added the "Archive", "CSV" and "Example" storage engines to the Linux · 953e46bd
      unknown authored
        "Max" RPM
      
      
      support-files/mysql.spec.sh:
        - added the "Archive", "CSV" and "Example" storage engines to the Max RPM
      953e46bd
    • unknown's avatar
      Checking size to no of free + 1 was not correct when · faadc33b
      unknown authored
      entry was released before check. Thus empty it is when
      size == no of free
      This caused a memory leak which inserted a hard limit of
      max 64 unique indexes in the cluster.
      
      faadc33b
  5. 30 Dec, 2004 4 commits
    • unknown's avatar
      Merged fixes for bug #7297 "Two digit year should be interpreted · fd9008c6
      unknown authored
      correctly even with zero month and day" and bug #7515 "from_unixtime(0)
      now returns NULL instead of the Epoch" into 4.1 tree.
      
      
      mysql-test/r/ps_2myisam.result:
        Updated test result after merging fix for bug #7297 "Two digit year should
        be interpreted correctly even with zero month and day" into 4.1
      mysql-test/r/ps_3innodb.result:
        Updated test result after merging fix for bug #7297 "Two digit year should
        be interpreted correctly even with zero month and day" into 4.1
      mysql-test/r/ps_4heap.result:
        Updated test result after merging fix for bug #7297 "Two digit year should
        be interpreted correctly even with zero month and day" into 4.1
      mysql-test/r/ps_5merge.result:
        Updated test result after merging fix for bug #7297 "Two digit year should
        be interpreted correctly even with zero month and day" into 4.1
      mysql-test/r/ps_6bdb.result:
        Updated test result after merging fix for bug #7297 "Two digit year should
        be interpreted correctly even with zero month and day" into 4.1
      mysql-test/r/ps_7ndb.result:
        Updated test result after merging fix for bug #7297 "Two digit year should
        be interpreted correctly even with zero month and day" into 4.1
      sql-common/my_time.c:
        Merged fix for bug #7297 "Two digit year should be interpreted correctly
        even with zero month and day" into 4.1
      sql/item_timefunc.cc:
        Small fix after merging patch solving bug #7515 "from_unixtime(0) now
        returns NULL instead of the Epoch" into 4.1.
      fd9008c6
    • unknown's avatar
      Merged bugfix · c4a8f412
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/ha_ndbcluster.h:
        Auto merged
      c4a8f412
    • unknown's avatar
      merged · e3e62d7a
      unknown authored
      e3e62d7a
    • unknown's avatar