diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:31:40 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:31:40 +0300 |
| commit | 41824a35338012ff8196eb975f961d5e0f0e2a22 (patch) | |
| tree | 1475a169c541e6b7aedb36103dd255fe52fc0517 /innobase/btr/btr0btr.c | |
| parent | 07bc35e1d024e5e3b81b131a47878510f0521609 (diff) | |
| parent | d32bdcb1bfc274476cdd945e66e00f3ec31253c3 (diff) | |
| download | mariadb-git-41824a35338012ff8196eb975f961d5e0f0e2a22.tar.gz | |
merge with 4.1 tree
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/errmsg.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'innobase/btr/btr0btr.c')
| -rw-r--r-- | innobase/btr/btr0btr.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/innobase/btr/btr0btr.c b/innobase/btr/btr0btr.c index d8a0959e47f..1af9336ce72 100644 --- a/innobase/btr/btr0btr.c +++ b/innobase/btr/btr0btr.c @@ -2376,8 +2376,15 @@ btr_index_rec_validate( type = dict_index_get_nth_type(index, i); - if (len != UNIV_SQL_NULL && dtype_is_fixed_size(type) - && len != dtype_get_fixed_size(type)) { + if ((dict_index_get_nth_field(index, i)->prefix_len == 0 + && len != UNIV_SQL_NULL && dtype_is_fixed_size(type) + && len != dtype_get_fixed_size(type)) + || + (dict_index_get_nth_field(index, i)->prefix_len > 0 + && len != UNIV_SQL_NULL && dtype_is_fixed_size(type) + && len != + dict_index_get_nth_field(index, i)->prefix_len)) { + fprintf(stderr, "InnoDB: Record in index %s in table %s, page %lu, at offset %lu\n" "InnoDB: field %lu len is %lu, should be %lu\n", |