summaryrefslogtreecommitdiff
path: root/innobase/include/rem0cmp.h
diff options
context:
space:
mode:
authoraivanov@mysql.com <>2005-12-06 22:02:40 +0300
committeraivanov@mysql.com <>2005-12-06 22:02:40 +0300
commit9eee25472e7ba5a1bce1d44bfd054f8aa0e68f2a (patch)
tree12215ce7c080a1a2ab6d1de62d6cb0dd7957a223 /innobase/include/rem0cmp.h
parent56e35734c20f2ce8130635c732ba92b68cbbd234 (diff)
downloadmariadb-git-9eee25472e7ba5a1bce1d44bfd054f8aa0e68f2a.tar.gz
Fix BUG#14747: "Race condition can cause btr_search_drop_page_hash_index()
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.
Diffstat (limited to 'innobase/include/rem0cmp.h')
-rw-r--r--innobase/include/rem0cmp.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/include/rem0cmp.h b/innobase/include/rem0cmp.h
index 1b1ee26b809..f6762078cbc 100644
--- a/innobase/include/rem0cmp.h
+++ b/innobase/include/rem0cmp.h
@@ -24,7 +24,8 @@ cmp_types_are_equal(
/* out: TRUE if the types are considered
equal in comparisons */
dtype_t* type1, /* in: type 1 */
- dtype_t* type2); /* in: type 2 */
+ dtype_t* type2, /* in: type 2 */
+ ibool check_charsets); /* in: whether to check charsets */
/*****************************************************************
This function is used to compare two data fields for which we know the
data type. */