1. 03 Jan, 2005 6 commits
  2. 02 Jan, 2005 4 commits
  3. 01 Jan, 2005 6 commits
    • unknown's avatar
      Fixed failed merge · 7a18eb7a
      unknown authored
      7a18eb7a
    • unknown's avatar
      Fixed failed merge · e2d17faa
      unknown authored
      e2d17faa
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4e6f43ac
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      4e6f43ac
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7e6dd93b
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      
      7e6dd93b
    • unknown's avatar
      mysql-test-run.pl: · 3e2e4fb7
      unknown authored
        Added --ps-protocol and --embedded-server
      
      
      mysql-test/mysql-test-run.pl:
        Added --ps-protocol and --embedded-server
      3e2e4fb7
    • unknown's avatar
      log0recv.c: · 56db297d
      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
      56db297d
  4. 31 Dec, 2004 11 commits
  5. 30 Dec, 2004 13 commits
    • unknown's avatar
      Merged fixes for bug #7297 "Two digit year should be interpreted · 0e302f5e
      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.
      0e302f5e
    • unknown's avatar
      Merged bugfix · ade13078
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/ha_ndbcluster.h:
        Auto merged
      ade13078
    • unknown's avatar
      merged · 379613c3
      unknown authored
      379613c3
    • unknown's avatar
    • unknown's avatar
      Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser · 523882ab
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      523882ab
    • unknown's avatar
      Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree. · e107535f
      unknown authored
      
      mysql-test/r/func_time.result:
        Manual merge.
      mysql-test/r/type_datetime.result:
        Manual merge.
      mysql-test/t/func_time.test:
        Manual merge.
      mysql-test/t/type_datetime.test:
        Manual merge.
      sql/item_timefunc.cc:
        Manual merge.
      sql/item_timefunc.h:
        Manual merge.
      sql/time.cc:
        Manual merge.
      e107535f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 15017480
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.0-bg7297
      
      
      15017480
    • unknown's avatar
      Fix for bug #7515 "from_unixtime(0) now returns NULL instead of · 1ffd688a
      unknown authored
      the Epoch". (With after review fixes).
      
      
      mysql-test/r/func_time.result:
        Added test for bug #7515 "from_unixtime(0) now returns NULL instead of
        the Epoch".
      mysql-test/t/func_time.test:
        Added test for bug #7515 "from_unixtime(0) now returns NULL instead of
        the Epoch".
      sql/item_timefunc.cc:
        Item_func_from_unixtime:
         from_unixtime(0) should return Epoch instead of NULL.
      sql/item_timefunc.h:
        Item_func_from_unixtime:
         - Removed unused method definition.
         - fix_length_and_dec() should set maybe_null to true since now
           from_unixtime() can return NULL even in case when none of its
           arguments is NULL.
      1ffd688a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 12b08e56
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
      
      
      12b08e56
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 81a81a95
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-look
      
      
      81a81a95
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 63af18b5
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      63af18b5
    • unknown's avatar
      Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 · 2ec8327e
      unknown authored
      
      configure.in:
        Auto merged
      2ec8327e
    • unknown's avatar
      Many files: · 4ad77748
      unknown authored
        Perl version of mysql-test-run
        new file
      
      
      mysql-test/lib/init_db.sql:
        Perl version of mysql-test-run
      mysql-test/lib/mtr_gcov.pl:
        Perl version of mysql-test-run
      mysql-test/lib/mtr_gprof.pl:
        Perl version of mysql-test-run
      mysql-test/lib/mtr_io.pl:
        Perl version of mysql-test-run
      mysql-test/lib/mtr_match.pl:
        Perl version of mysql-test-run
      mysql-test/lib/mtr_misc.pl:
        Perl version of mysql-test-run
      mysql-test/lib/mtr_process.pl:
        Perl version of mysql-test-run
      mysql-test/lib/mtr_report.pl:
        Perl version of mysql-test-run
      mysql-test/mysql-test-run.pl:
        Perl version of mysql-test-run
      4ad77748