mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
After merge fixes
innobase/dict/dict0load.c: dict_load_table(): Display diagnostic output if mix_len differs from 0.
This commit is contained in:
commit
ab0e331436
1 changed files with 1 additions and 17 deletions
|
@ -784,7 +784,7 @@ dict_load_table(
|
|||
|
||||
mix_len = mach_read_from_4(field);
|
||||
|
||||
if (mix_len != 0 && mix_len != 0x80000000) {
|
||||
if (mix_len != 0) {
|
||||
ut_print_timestamp(stderr);
|
||||
|
||||
fprintf(stderr,
|
||||
|
@ -792,22 +792,6 @@ dict_load_table(
|
|||
name, (ulong)mix_len);
|
||||
}
|
||||
|
||||
#if MYSQL_VERSION_ID < 50300
|
||||
/* Starting from MySQL 5.0.3, the high-order bit of MIX_LEN is the
|
||||
"compact format" flag. */
|
||||
field = rec_get_nth_field(rec, 7, &len);
|
||||
if (mach_read_from_1(field) & 0x80) {
|
||||
btr_pcur_close(&pcur);
|
||||
mtr_commit(&mtr);
|
||||
mem_heap_free(heap);
|
||||
ut_print_timestamp(stderr);
|
||||
fprintf(stderr,
|
||||
" InnoDB: table %s is in the new compact format\n"
|
||||
"InnoDB: of MySQL 5.0.3 or later\n", name);
|
||||
return(NULL);
|
||||
}
|
||||
#endif /* MYSQL_VERSION_ID < 50300 */
|
||||
|
||||
ut_a(0 == ut_strcmp("SPACE",
|
||||
dict_field_get_col(
|
||||
dict_index_get_nth_field(
|
||||
|
|
Loading…
Reference in a new issue