1. 15 May, 2006 5 commits
    • unknown's avatar
      Fix, or a workaround for Bug#19386 "Multiple alter causes crashed table" · ad7b9569
      unknown authored
      The problem is that in a MyISAM table the following column
      after a varchar field gets corrupted, if varchar field is
      extended.
      
      This should be made to work without a copy in the future, but
      I'm not sure if this code is ready yet. This fix will force copy
      in this case. It will not do any harm to have it here, only makes
      alter table a bit slower in this case. If this should work for
      MyISAM, then the bug is somewhere else in that code.
      
      Until it works, I propose this as a temporary fix or a workaround.
      Test case for the bug has been added.
      
      
      mysql-test/r/alter_table.result:
        Added test case for Bug#19386: Multiple alter causes crashed table.
      mysql-test/t/alter_table.test:
        Added test case for Bug#19386: Multiple alter causes crashed table.
      sql/ha_myisam.cc:
        For MyISAM type, if varchar column is extended, it should return not
        compatible for now. In other words, it forces a copy of the table during
        alter table.
      ad7b9569
    • unknown's avatar
      Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss547-work · cccd302c
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.1-ss547
       Null merge
      
      
      sql/ha_innodb.cc:
        Null merge
      storage/innobase/os/os0file.c:
        Null merge
      cccd302c
    • unknown's avatar
      Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss29-work · 889e60da
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss547-work
       Null merge
      
      
      innobase/os/os0file.c:
        Null merge
      sql/ha_innodb.cc:
        Null merge
      889e60da
    • unknown's avatar
      Applied innodb-5.0-ss547 snapshot. · c55912b0
      unknown authored
       Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter".
      
      
      innobase/os/os0file.c:
        Applied innodb-5.0-ss547 snapshot.
         Check the page trailers also after writing to disk.
         This improves the chances of diagnosing Bug 18886.
         os_file_check_page_trailers(): New function for checking
         that two copies of the LSN stamped on the pages match.
         os_aio_simulated_handle(): Call os_file_check_page_trailers()
         before and after os_file_write().
      sql/ha_innodb.cc:
        Applied innodb-5.0-ss547 snapshot.
         Increment statistic counter in ha_innobase::index_prev().
      c55912b0
    • unknown's avatar
      Applied innodb-4.1-ss29 snapshot. · 8069b05d
      unknown authored
       Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter.
       
      
      
      innobase/os/os0file.c:
        Applied innodb-4.1-ss29 snapshot.
         Check the page trailers also after writing to disk.
         This improves the chances of diagnosing Bug 18886.
         os_file_check_page_trailers(): New function for checking
         that two copies of the LSN stamped on the pages match.
         os_aio_simulated_handle(): Call os_file_check_page_trailers()
         before and after os_file_write().
      sql/ha_innodb.cc:
        Applied innodb-4.1-ss29 snapshot.
         Increment statistic counter in ha_innobase::index_prev().
      8069b05d
  2. 13 May, 2006 4 commits
  3. 12 May, 2006 21 commits
    • unknown's avatar
      Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7a56b6e1
      unknown authored
      into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
      
      
      BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
        Auto merged
      BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d:
        Auto merged
      7a56b6e1
    • unknown's avatar
      .del-ndb_partition_range.result~17fc1db754d4153d: · a02faddc
      unknown authored
        Delete: mysql-test/r/ndb_partition_range.result
      .del-ndb_partition_list.result~7af68cd45e74abf:
        Delete: mysql-test/r/ndb_partition_list.result
      .del-ndb_partition_key.result~68b9a59cff8c9840:
        Delete: mysql-test/r/ndb_partition_key.result
      .del-ndb_partition_error.result~944f84894e323e9:
        Delete: mysql-test/r/ndb_partition_error.result
      .del-ndb_blob_partition.result~fda88ddfc5477a7e:
        Delete: mysql-test/r/ndb_blob_partition.result
      .del-ndb_partition_range.test~af8f9016b6648239:
        Delete: mysql-test/t/ndb_partition_range.test
      .del-ndb_partition_list.test~940289b3d58595ca:
        Delete: mysql-test/t/ndb_partition_list.test
      .del-ndb_partition_key.test~ed7b15c91f66558d:
        Delete: mysql-test/t/ndb_partition_key.test
      .del-ndb_partition_error.test~2da477be29be041f:
        Delete: mysql-test/t/ndb_partition_error.test
      .del-ndb_blob_partition.test~ea99ef9759705ce3:
        Delete: mysql-test/t/ndb_blob_partition.test
      
      
      BitKeeper/deleted/.del-ndb_blob_partition.test~ea99ef9759705ce3:
        Delete: mysql-test/t/ndb_blob_partition.test
      BitKeeper/deleted/.del-ndb_partition_error.test~2da477be29be041f:
        Delete: mysql-test/t/ndb_partition_error.test
      BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d:
        Delete: mysql-test/t/ndb_partition_key.test
      BitKeeper/deleted/.del-ndb_partition_list.test~940289b3d58595ca:
        Delete: mysql-test/t/ndb_partition_list.test
      BitKeeper/deleted/.del-ndb_partition_range.test~af8f9016b6648239:
        Delete: mysql-test/t/ndb_partition_range.test
      BitKeeper/deleted/.del-ndb_blob_partition.result~fda88ddfc5477a7e:
        Delete: mysql-test/r/ndb_blob_partition.result
      BitKeeper/deleted/.del-ndb_partition_error.result~944f84894e323e9:
        Delete: mysql-test/r/ndb_partition_error.result
      BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
        Delete: mysql-test/r/ndb_partition_key.result
      BitKeeper/deleted/.del-ndb_partition_list.result~7af68cd45e74abf:
        Delete: mysql-test/r/ndb_partition_list.result
      BitKeeper/deleted/.del-ndb_partition_range.result~17fc1db754d4153d:
        Delete: mysql-test/r/ndb_partition_range.result
      a02faddc
    • unknown's avatar
      Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · 0490cb5b
      unknown authored
      into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
      
      
      0490cb5b
    • unknown's avatar
      Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 · f7190a3e
      unknown authored
      into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
      
      
      mysql-test/t/partition.test:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/ndb_partition_key.result:
        manual merge
      mysql-test/r/partition.result:
        manual merge
      mysql-test/t/ndb_partition_key.test:
        manual merge
      f7190a3e
    • unknown's avatar
      merge · b48f2e61
      unknown authored
      b48f2e61
    • unknown's avatar
      fix results after merge · 7937b3e6
      unknown authored
      7937b3e6
    • unknown's avatar
      Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · 0e336304
      unknown authored
      into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
      
      
      mysql-test/r/ndb_dd_basic.result:
        Auto merged
      mysql-test/r/ndb_partition_key.result:
        Auto merged
      mysql-test/t/ndb_partition_key.test:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/unireg.cc:
        Auto merged
      0e336304
    • unknown's avatar
      Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502 · b6bb92a2
      unknown authored
      into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
      
      
      sql/ha_partition.cc:
        Auto merged
      mysql-test/r/partition.result:
        manual merge
      mysql-test/t/partition.test:
        manual merge
      b6bb92a2
    • unknown's avatar
      Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501 · ef481319
      unknown authored
      into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
      
      
      mysql-test/r/partition.result:
        manual merge
      mysql-test/t/partition.test:
        manual merge
      ef481319
    • unknown's avatar
      Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062 · 1e135a10
      unknown authored
      into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
      
      
      1e135a10
    • unknown's avatar
      manual merge bug#10952 · 93c397f9
      unknown authored
      
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      93c397f9
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 19b40124
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      
      19b40124
    • unknown's avatar
      rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test: · 07f3ca8c
      unknown authored
        Updated per lars
      rpl_row_flsh_tbls.test:
        updated per lars
      
      
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Updated per lars
      mysql-test/t/rpl_row_flsh_tbls.test:
        updated per lars
      mysql-test/t/rpl_multi_engine.test:
        Updated per lars
      mysql-test/t/rpl_row_basic_11bugs.test:
        Updated per lars
      07f3ca8c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · a8c13c34
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      sql/sql_acl.cc:
        Auto merged
      a8c13c34
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 74e7b09c
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win
      
      
      74e7b09c
    • unknown's avatar
      Bug#19728: Test mysqldump failure · e005a5b3
      unknown authored
      regex is fixed for windows.
      
      
      mysql-test/t/mysqldump.test:
        Windows' suffix is accounted.
      e005a5b3
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md · e1827da7
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      e1827da7
    • unknown's avatar
      Rename cmakelists.txt -> CMakeLists.txt · e8a5d25b
      unknown authored
      e8a5d25b
    • unknown's avatar
      Fix after merge 5.0->5.1 · 144c7622
      unknown authored
      
      client/mysqlimport.c:
        Variable name changed mysql_connection -> mysql
      include/violite.h:
        Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
      vio/viosslfactories.c:
        Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
      144c7622
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · 16d46c9c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
        Auto merged
      BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
        Auto merged
      BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/std_data/cacert.pem:
        Auto merged
      mysql-test/std_data/client-cert.pem:
        Auto merged
      mysql-test/std_data/client-key.pem:
        Auto merged
      mysql-test/std_data/server-cert.pem:
        Auto merged
      mysql-test/std_data/server-key.pem:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
        Auto merged
      vio/vio.c:
        Auto merged
      client/client_priv.h:
        Merge 5.0 -> 5.1
      include/violite.h:
        Merge 5.0 -> 5.1
      mysql-test/Makefile.am:
        Merge 5.0 -> 5.1
      mysql-test/t/disabled.def:
        Merge 5.0 -> 5.1
      sql/mysqld.cc:
        Merge 5.0 -> 5.1
      vio/viossl.c:
        Merge 5.0 -> 5.1
      vio/viosslfactories.c:
        Merge 5.0 -> 5.1
      16d46c9c
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0e33ad1f
      unknown authored
      into  mysql.com:/home/mysql-5.1-19509.19509
      
      
      0e33ad1f
  4. 11 May, 2006 10 commits