diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-03-08 17:18:27 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-03-08 17:18:27 +0200 |
| commit | ab0e3314360d648d394563a833d118376fb32759 (patch) | |
| tree | 64659bcc7a41472197fb2e473923712f31fc3ab6 /innobase/dict | |
| parent | b80ec98e28fdf4c72f0e62d781183b468e8bfb65 (diff) | |
| parent | 976543fe847ea2a23612e35bae790658d069b5f2 (diff) | |
| download | mariadb-git-ab0e3314360d648d394563a833d118376fb32759.tar.gz | |
After merge fixes
innobase/dict/dict0load.c:
dict_load_table():
Display diagnostic output if mix_len differs from 0.
Diffstat (limited to 'innobase/dict')
| -rw-r--r-- | innobase/dict/dict0load.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c index 717c64c3963..26e92afabe0 100644 --- a/innobase/dict/dict0load.c +++ b/innobase/dict/dict0load.c @@ -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( |