1. 06 Dec, 2005 1 commit
    • unknown's avatar
      Fix BUG#14747: "Race condition can cause btr_search_drop_page_hash_index() · b83c2976
      unknown authored
       to crash".
       Changes from snapshot innodb-5.0-ss52.
       Note that buf_block_t::index should be protected by btr_search_latch
       or an s-latch or x-latch on the index page.
       btr_search_drop_page_hash_index(): Read block->index while holding
       btr_search_latch and use the cached value in the loop. Remove some
       redundant assertions.
       Also fix 13778. When FOREIGN_KEY_CHECKS=0 we still need to check that
       datatypes between foreign key references are compatible.
       Also added test cases to 9802.
      
      
      innobase/btr/btr0sea.c:
        Changes from innodb-5.0-ss52
      innobase/dict/dict0dict.c:
        Changes from innodb-5.0-ss52
      innobase/dict/dict0load.c:
        Changes from innodb-5.0-ss52
      innobase/include/buf0buf.h:
        Changes from innodb-5.0-ss52
      innobase/include/dict0dict.h:
        Changes from innodb-5.0-ss52
      innobase/include/dict0load.h:
        Changes from innodb-5.0-ss52
      innobase/include/rem0cmp.h:
        Changes from innodb-5.0-ss52
      innobase/rem/rem0cmp.c:
        Changes from innodb-5.0-ss52
      innobase/row/row0mysql.c:
        Changes from innodb-5.0-ss52
      mysql-test/r/innodb.result:
        Changes from innodb-5.0-ss52
      mysql-test/t/innodb.test:
        Changes from innodb-5.0-ss52
      sql/ha_innodb.cc:
        Changes from innodb-5.0-ss52
      sql/ha_innodb.h:
        Changes from innodb-5.0-ss52
      b83c2976
  2. 05 Dec, 2005 10 commits
  3. 04 Dec, 2005 4 commits
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · e236de83
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      client/mysql.cc:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      netware/mysql_test_run.c:
        Merged from 4.1.
      e236de83
    • unknown's avatar
      Fixes multi_statement test case on NetWare. · 928ee5ce
      unknown authored
      928ee5ce
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · 69e0cc6d
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      client/mysql.cc:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      isam/isamchk.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Merged from 4.0.
      69e0cc6d
    • unknown's avatar
      A set of Netware related patches. · 60f2e7a9
      unknown authored
      
      client/mysql.cc:
        Fixed option name.
      client/mysqladmin.c:
        Fixed option name.
      client/mysqlbinlog.cc:
        Fixed option name.
      client/mysqlcheck.c:
        Fixed option name.
      client/mysqldump.c:
        Fixed option name.
      client/mysqlimport.c:
        Fixed option name.
      client/mysqlshow.c:
        Fixed option name.
      isam/isamchk.c:
        Fixed option name.
      myisam/myisamchk.c:
        Fixed option name.
      myisam/myisampack.c:
        Fixed option name.
      sql/sql_parse.cc:
        Fix problem with kill connection on NetWare.
      60f2e7a9
  4. 03 Dec, 2005 2 commits
    • unknown's avatar
      my_global.h: · bbaf62b4
      unknown authored
        Make __cxa_pure_virtual weak symbol
      
      
      include/my_global.h:
        Make __cxa_pure_virtual weak symbol
      bbaf62b4
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 30beae25
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      30beae25
  5. 02 Dec, 2005 18 commits
  6. 01 Dec, 2005 5 commits
    • unknown's avatar
      Post-merge result file cleanup · 025d8c14
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Fix results
      025d8c14
    • unknown's avatar
      Fix bug#15028 Multitable update returns different numbers of matched rows · 136c8173
      unknown authored
      depending on table order
      
      multi_update::send_data() was counting updates, not updated rows. Thus if one 
      record have several updates it will be counted several times in 'rows matched'
      but updated only once.
      
      multi_update::send_data() now counts only unique rows.
      
      
      sql/sql_update.cc:
        Fix bug#15028  Multitable update returns different numbers of matched rows
        depending on table order
        multi_update::send_data() now counts only unique rows.
      mysql-test/t/update.test:
        Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
      mysql-test/r/update.result:
        Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
      136c8173
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-13318 · 3016ec15
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Resolve conflicts
      mysql-test/t/mysqldump.test:
        Resolve conflicts
      3016ec15
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12612 · f604204f
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/r/func_equal.result:
        Auto merged
      mysql-test/t/func_equal.test:
        Auto merged
      sql/item_cmpfunc.cc:
        SCCS merged
      f604204f
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-keysize · 5df3be70
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      5df3be70