diff options
| author | unknown <brian@zim.(none)> | 2007-01-26 15:36:39 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2007-01-26 15:36:39 -0800 |
| commit | 02d71f7b463f10ab0fe4c014a4ed333776ede9bc (patch) | |
| tree | b0e32a887732c37610abf9ab54835020305b97d7 /storage/archive | |
| parent | 0c1d02e4e7ee29591c8f515f212b75c2f0099623 (diff) | |
| download | mariadb-git-02d71f7b463f10ab0fe4c014a4ed333776ede9bc.tar.gz | |
Two things:
1) Two small windows cleanups for Archive.
2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world.
include/mysql/plugin.h:
Added new I_S type.
mysql-test/r/archive.result:
Fixed not dropped table.
mysql-test/t/archive.test:
Added additional drop table
sql/sql_plugin.cc:
Adding support in for the I_S.
sql/sql_show.cc:
Added schema type for plugin I_S. Additional loops were added to pop these on to the end of requests.
storage/archive/ha_archive.cc:
Windwos typo
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 584de61ca10..50abea9b664 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -629,11 +629,11 @@ int ha_archive::create(const char *name, TABLE *table_arg, */ frm_file= my_open(name_buff, O_RDONLY, MYF(0)); VOID(my_fstat(frm_file, &file_stat, MYF(MY_WME))); - frm_ptr= (char *)my_malloc(sizeof(char) * file_stat.st_size , MYF(0)); + frm_ptr= (byte *)my_malloc(sizeof(byte) * file_stat.st_size , MYF(0)); my_read(frm_file, frm_ptr, file_stat.st_size, MYF(0)); azwrite_frm(&create_stream, (char *)frm_ptr, file_stat.st_size); my_close(frm_file, MYF(0)); - my_free(frm_ptr, MYF(0)); + my_free((gptr)frm_ptr, MYF(0)); if (create_info->comment.str) azwrite_comment(&create_stream, create_info->comment.str, |