1. 07 Nov, 2006 1 commit
  2. 27 Oct, 2006 7 commits
  3. 26 Oct, 2006 1 commit
  4. 25 Oct, 2006 9 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · b3e1dd37
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug22119
      
      b3e1dd37
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 70073a3f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug22119
      
      70073a3f
    • unknown's avatar
      Bug#22119 - Changing MI_KEY_BLOCK_LENGTH makes a wrong myisamchk · 859a812e
      unknown authored
      Added the promised test case.
      
      
      mysql-test/r/myisam.result:
        Bug#22119 - Changing MI_KEY_BLOCK_LENGTH makes a wrong myisamchk
        Added test result.
      mysql-test/t/myisam.test:
        Bug#22119 - Changing MI_KEY_BLOCK_LENGTH makes a wrong myisamchk
        Added test case.
      859a812e
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-bug22119 · fd78d3b8
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug22119
      
      
      storage/myisam/mi_check.c:
        Auto merged
      fd78d3b8
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-5.0-engines · b3604799
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-5.1-engines
      
      
      storage/myisam/mi_dynrec.c:
        Auto merged
      b3604799
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-bug22119 · ad3390a7
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug22119
      
      
      myisam/mi_check.c:
        Auto merged
      ad3390a7
    • unknown's avatar
      Bug#22119 - Changing MI_KEY_BLOCK_LENGTH makes a wrong myisamchk · b5d19148
      unknown authored
      When compiling with a default key block size greater than the
      smallest key block size used in a table, checking that table
      failed with bogus errors. The table was marked corrupt. This
      affected myisamchk and the server.
      
      The problem was that the default key block size was used at
      some places where sizes less or equal to the block size of the
      index in check was required.
      
      We do now use the key block size of the particular index
      when checking.
      
      A test case is available for later versions only.
      
      
      myisam/mi_check.c:
        Bug#22119 - Changing MI_KEY_BLOCK_LENGTH makes a wrong myisamchk
        Changed check_k_link() and chk_index_down() to use the block
        size of the index in check or MI_MIN_KEY_BLOCK_LENGTH where
        required. Formerly myisam_block_size or MYISAM_SHARE::blocksize
        was used wrongly.
      b5d19148
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-4.1-engines · 3e548a3c
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-5.0-engines
      
      
      myisam/mi_dynrec.c:
        Auto merged
      3e548a3c
    • unknown's avatar
      BUG#22053 - REPAIR table can crash server for some · 115fe018
      unknown authored
                  really damaged MyISAM tables
      
      When unpacking a blob column from broken row server crash
      could happen. This could rather happen when trying to repair
      a table using either REPAIR TABLE or myisamchk, though it
      also could happend when trying to access broken row using
      other SQL statements like SELECT if table is not marked as
      crashed.
      
      Fixed ulong overflow when trying to extract blob from
      broken row.
      
      Affects MyISAM only.
      
      
      myisam/mi_dynrec.c:
        Fixed ulong overflow when trying to extract blob from
        broken row. It happens when there are not enough bytes
        to store blob length in `from' buffer. In this case
        (ulong) (from_end - from) - size_length value is huge,
        close to ULONG_MAX.
      115fe018
  5. 24 Oct, 2006 2 commits
  6. 21 Oct, 2006 1 commit
  7. 20 Oct, 2006 10 commits
    • unknown's avatar
      configure.in: · 7632cf5b
      unknown authored
        Raised version number to 5.0.28
      
      
      configure.in:
        Raised version number to 5.0.28
      7632cf5b
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release · 82ae9e46
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      configure.in:
        Auto merged
      82ae9e46
    • unknown's avatar
      make_win_bin_dist: · 7ac5d475
      unknown authored
        Copy udf examples and raid.h
        Create target "include" directory before copying files to it
      CMakeLists.txt:
        Only compile in bdb if configured
      configure.in:
        Raised version number to 5.0.27
      
      
      scripts/make_win_bin_dist:
        Copy udf examples and raid.h
        Create target "include" directory before copying files to it
      CMakeLists.txt:
        Only compile in bdb if configured
      configure.in:
        Raised version number to 5.0.27
      7ac5d475
    • unknown's avatar
      Bug #23427: incompatible ABI change in 5.0.26? · aaf7228f
      unknown authored
      Revert 1 June change enough to restore ABI compatibility with previous
      versions.
      
      
      include/mysql.h:
        Revert patch that breaks ABI compatibility
      libmysqld/lib_sql.cc:
        Remove useless assignment.
      aaf7228f
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · da87029a
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      mysql-test/r/myisam.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      da87029a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1 · 20755b2a
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      mysql-test/r/myisam.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      20755b2a
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · a5a18a77
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a5a18a77
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 6e7da3ee
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      mysql-test/r/myisam.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      6e7da3ee
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · a2a77ea2
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
      
      
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a2a77ea2
    • unknown's avatar
      sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result: · 736b9f65
      unknown authored
        merge fixes
      
      
      mysql-test/r/mix2_myisam.result:
        merge fixes
      mysql-test/r/type_decimal.result:
        merge fixes
      sql/sql_rename.cc:
        merge fixes
      sql/sql_table.cc:
        merge fixes
      736b9f65
  8. 19 Oct, 2006 9 commits
    • unknown's avatar
      After merge fix. · 95f4e5b3
      unknown authored
      95f4e5b3
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines · 30df5ede
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
      
      
      mysql-test/t/repair.test:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      mysql-test/r/repair.result:
        Manual merge.
      30df5ede
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · c634eca2
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      BitKeeper/deleted/.del-bdb.result:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/r/group_min_max.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/group_min_max.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      include/my_base.h:
        SCCS merged
      mysql-test/include/mix1.inc:
        SCCS merged
      mysql-test/r/group_by.result:
        SCCS merged
      mysql-test/r/innodb_mysql.result:
        SCCS merged
      mysql-test/t/group_by.test:
        SCCS merged
      sql/sql_select.cc:
        SCCS merged
      c634eca2
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 · 170bfde5
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/table.cc:
        Auto merged
      170bfde5
    • unknown's avatar
      After merge fix. · f00728f6
      unknown authored
      f00728f6
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines · ea709466
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
      
      
      myisam/sort.c:
        Auto merged
      mysql-test/r/repair.result:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      sql/sql_base.cc:
        Use local.
      ea709466
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · c5435fd8
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/olap.result:
        SCCS merged
      c5435fd8
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 · b60868ac
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      b60868ac
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG23175/mysql-4.1-engines · 05e9ed2a
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
      
      
      mysql-test/r/repair.result:
        Manual merge.
      mysql-test/t/repair.test:
        Manual merge.
      05e9ed2a