diff options
| author | monty@narttu.mysql.fi <> | 2003-08-29 13:44:35 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-08-29 13:44:35 +0300 |
| commit | 77a70a0a24ce658a3ee55248cb2e76f84afc1b88 (patch) | |
| tree | aeb2314adbd714c7e2b032209bfd7914e3cfda3d /innobase | |
| parent | 6cad89775b4ed78c02c2fa9f3e49181f63b7fb65 (diff) | |
| parent | 5e04e2370f05bc42437f8be476eba9e204888b65 (diff) | |
| download | mariadb-git-77a70a0a24ce658a3ee55248cb2e76f84afc1b88.tar.gz | |
merge with 4.0.15
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/btr/btr0btr.c | 11 | ||||
| -rw-r--r-- | innobase/dict/dict0dict.c | 7 | ||||
| -rw-r--r-- | innobase/os/os0file.c | 7 |
3 files changed, 17 insertions, 8 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", diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c index 924fa3ecf95..a576a886b97 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -1596,6 +1596,13 @@ dict_index_build_internal_clust( break; } + if (dict_index_get_nth_field(new_index, i)->prefix_len + > 0) { + new_index->trx_id_offset = 0; + + break; + } + new_index->trx_id_offset += fixed_size; } diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index e31fd1d9efe..f4f50320906 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -226,13 +226,8 @@ os_file_get_last_error(void) "InnoDB: the directory. It may also be you have created a subdirectory\n" "InnoDB: of the same name as a data file.\n"); } else { - if (strerror((int)err) != NULL) { - fprintf(stderr, - "InnoDB: Error number %lu means '%s'.\n", err, strerror((int)err)); - } - fprintf(stderr, - "InnoDB: See also section 13.2 at http://www.innodb.com/ibman.html\n" + "InnoDB: See section 13.2 at http://www.innodb.com/ibman.html\n" "InnoDB: about operating system error numbers.\n"); } } |