diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-07-11 11:59:46 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-07-11 11:59:46 +0300 |
| commit | 1f7a28bda1c1e323d5ab4099b00d4e8b042e0674 (patch) | |
| tree | 08b222f8495536633bceadf3586b2ecde0f84312 /myisam | |
| parent | f3d270df69d1df1e9711e6c828c38539f20046f9 (diff) | |
| parent | 015e1290a1db21e02560447ffd72238827add8f7 (diff) | |
| download | mariadb-git-1f7a28bda1c1e323d5ab4099b00d4e8b042e0674.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B29325-5.0-opt
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_create.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/myisam/mi_create.c b/myisam/mi_create.c index ea1d8c7b83e..dd8a5b0d525 100644 --- a/myisam/mi_create.c +++ b/myisam/mi_create.c @@ -586,7 +586,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 32 : 0)); linkname_ptr=0; /* Replace the current file */ - create_flag=MY_DELETE_OLD; + if (!(flags & HA_CREATE_KEEP_FILES)) + create_flag=MY_DELETE_OLD; } /* @@ -647,7 +648,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, { fn_format(filename,name,"",MI_NAME_DEXT,4); linkname_ptr=0; - create_flag=MY_DELETE_OLD; + if (!(flags & HA_CREATE_KEEP_FILES)) + create_flag=MY_DELETE_OLD; } if ((dfile= my_create_with_symlink(linkname_ptr, filename, 0, create_mode, |