diff options
| author | unknown <serg@serg.mylan> | 2005-01-24 19:41:42 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-24 19:41:42 +0100 |
| commit | a82fd1eaec9067bbed9cceb9294734a8d09b72da (patch) | |
| tree | 0c73a61f5c88d003eae464001af7656745e9ba4e /sql/table.cc | |
| parent | 7eb825a07280dfeb1bae3def25a3bc0add544a74 (diff) | |
| parent | 7109999b92ec8541a61ca5babc5b06f4315478a8 (diff) | |
| download | mariadb-git-a82fd1eaec9067bbed9cceb9294734a8d09b72da.tar.gz | |
merged
BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/tztime.cc:
Auto merged
tests/client_test.c:
Auto 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); |