diff options
author | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
---|---|---|
committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
commit | 5be4c3822691f8bca4c8444ccc77b4b01bc996c1 (patch) | |
tree | a1ec5dfbd668a88bc0b6c98db397a421d2b37f21 /storage/myisammrg/myrg_open.c | |
parent | 169f7da04c4ffc43355d5a632a8013bc4caea39b (diff) | |
parent | 1ba25ae47caace207cda0be2b7994a1a845e6cce (diff) | |
download | mariadb-git-5be4c3822691f8bca4c8444ccc77b4b01bc996c1.tar.gz |
Merge from 5.0 for 43414
Diffstat (limited to 'storage/myisammrg/myrg_open.c')
-rw-r--r-- | storage/myisammrg/myrg_open.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/myisammrg/myrg_open.c b/storage/myisammrg/myrg_open.c index 01420f47a0c..b82e3682ebf 100644 --- a/storage/myisammrg/myrg_open.c +++ b/storage/myisammrg/myrg_open.c @@ -37,7 +37,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) { int save_errno,errpos=0; - uint files= 0, i, dir_length, length, key_parts, min_keys= 0; + uint files= 0, i, dir_length, length, UNINIT_VAR(key_parts), min_keys= 0; ulonglong file_offset=0; char name_buff[FN_REFLEN*2],buff[FN_REFLEN],*end; MYRG_INFO *m_info=0; @@ -49,8 +49,6 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) my_bool bad_children= FALSE; DBUG_ENTER("myrg_open"); - LINT_INIT(key_parts); - bzero((char*) &file,sizeof(file)); if ((fd=my_open(fn_format(name_buff,name,"",MYRG_NAME_EXT, MY_UNPACK_FILENAME|MY_APPEND_EXT), |