summaryrefslogtreecommitdiff
path: root/innobase/include
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2004-09-16 20:50:24 +0300
committerunknown <heikki@hundin.mysql.fi>2004-09-16 20:50:24 +0300
commita2d94d92f5b462d64aa33cdef8e0a0c0ae2297ae (patch)
tree4af62c5047a3c9d07dd0bae6236b6e6677cb207c /innobase/include
parent8bf8c8596873b534ad4a13eb73152c617c50c21b (diff)
downloadmariadb-git-a2d94d92f5b462d64aa33cdef8e0a0c0ae2297ae.tar.gz
dict0dict.h, dict0dict.c, row0row.c, pars0opt.c:
Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref() innobase/pars/pars0opt.c: Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref() innobase/row/row0row.c: Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref() innobase/dict/dict0dict.c: Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref() innobase/include/dict0dict.h: Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref()
Diffstat (limited to 'innobase/include')
-rw-r--r--innobase/include/dict0dict.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/innobase/include/dict0dict.h b/innobase/include/dict0dict.h
index 835c2c2b2e6..9940be9832d 100644
--- a/innobase/include/dict0dict.h
+++ b/innobase/include/dict0dict.h
@@ -566,8 +566,10 @@ dict_index_contains_col_or_prefix(
dict_index_t* index, /* in: index */
ulint n); /* in: column number */
/************************************************************************
-Looks for a matching field in an index. The column and the prefix len has
-to be the same. */
+Looks for a matching field in an index. The column has to be the same. The
+column in index must be complete, or must contain a prefix longer than the
+column in index2. That is, we must be able to construct the prefix in index2
+from the prefix in index. */
ulint
dict_index_get_nth_field_pos(