diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:33:58 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:33:58 +0200 |
commit | cda52b2cb28091c4372880a2b68a9174f21bd885 (patch) | |
tree | a218d19f72ad42bacc2d170c01381bdc5176a4ae /sql/unireg.cc | |
parent | 0d1a59587566fb6ee27205fa64949a4cf4288dd1 (diff) | |
download | mariadb-git-cda52b2cb28091c4372880a2b68a9174f21bd885.tar.gz |
remove dead HAVE_CRYPTED_FRM code
and now-unused read_string() function
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r-- | sql/unireg.cc | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 20d101be1a3..90039c478be 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -396,28 +396,6 @@ bool mysql_create_frm(THD *thd, const char *file_name, pack_fields(file, create_fields, data_offset)) goto err; -#ifdef HAVE_CRYPTED_FRM - if (create_info->password) - { - char tmp=2,*disk_buff=0; - SQL_CRYPT *crypted=new SQL_CRYPT(create_info->password); - if (!crypted || mysql_file_pwrite(file, &tmp, 1, 26, MYF_RW))// Mark crypted - goto err; - uint read_length=uint2korr(forminfo)-256; - mysql_file_seek(file, filepos+256, MY_SEEK_SET, MYF(0)); - if (read_string(file,(uchar**) &disk_buff,read_length)) - goto err; - crypted->encode(disk_buff,read_length); - delete crypted; - if (mysql_file_pwrite(file, disk_buff, read_length, filepos+256, MYF_RW)) - { - my_free(disk_buff); - goto err; - } - my_free(disk_buff); - } -#endif - my_free(screen_buff); my_free(keybuff); |