diff options
| author | serg@serg.mylan <> | 2005-01-24 19:41:42 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-01-24 19:41:42 +0100 |
| commit | c76405a7ee4f7ceb928c6d09d9704f028d6dde6b (patch) | |
| tree | 0c73a61f5c88d003eae464001af7656745e9ba4e /sql/table.cc | |
| parent | 24468e48f32fb7f5d4e76047acb2e892ffd3825f (diff) | |
| parent | 1ca9d6497b7c3c276387470fce52e6b1cadc4f67 (diff) | |
| download | mariadb-git-c76405a7ee4f7ceb928c6d09d9704f028d6dde6b.tar.gz | |
merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index a030da95db4..82ad32341c0 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -342,12 +342,14 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, VOID(my_seek(file,pos,MY_SEEK_SET,MYF(0))); if (my_read(file,(byte*) head,288,MYF(MY_NABP))) goto err; +#ifdef HAVE_CRYPTED_FRM if (crypted) { crypted->decode((char*) head+256,288-256); if (sint2korr(head+284) != 0) // Should be 0 goto err; // Wrong password } +#endif share->fields= uint2korr(head+258); pos= uint2korr(head+260); /* Length of all screens */ @@ -375,12 +377,14 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, pos+ (uint) (n_length+int_length+com_length)); if (read_string(file,(gptr*) &disk_buff,read_length)) goto err; /* purecov: inspected */ +#ifdef HAVE_CRYPTED_FRM if (crypted) { crypted->decode((char*) disk_buff,read_length); delete crypted; crypted=0; } +#endif strpos= disk_buff+pos; share->intervals= (TYPELIB*) (field_ptr+share->fields+1); |