diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-07-11 11:57:49 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-07-11 11:57:49 +0300 |
| commit | 49285e96d974c5993e5dc04582b9e6c58bcc5b5d (patch) | |
| tree | 59e8a2b8ae66e1621ebc91c449331732c2cb907f /storage | |
| parent | c5025571834a80a85c263e7f17209edc574e8925 (diff) | |
| parent | 015e1290a1db21e02560447ffd72238827add8f7 (diff) | |
| download | mariadb-git-49285e96d974c5993e5dc04582b9e6c58bcc5b5d.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B29325-5.1-opt
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 2 | ||||
| -rw-r--r-- | storage/myisam/mi_create.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 98f74247707..3614166e97c 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1889,6 +1889,8 @@ int ha_myisam::create(const char *name, register TABLE *table_arg, if (ha_create_info->options & HA_LEX_CREATE_TMP_TABLE) create_flags|= HA_CREATE_TMP_TABLE; + if (ha_create_info->options & HA_CREATE_KEEP_FILES) + create_flags|= HA_CREATE_KEEP_FILES; if (options & HA_OPTION_PACK_RECORD) create_flags|= HA_PACK_RECORD; if (options & HA_OPTION_CHECKSUM) diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c index c177aa8d987..0bea1975f61 100644 --- a/storage/myisam/mi_create.c +++ b/storage/myisam/mi_create.c @@ -615,7 +615,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, (have_iext ? MY_REPLACE_EXT : MY_APPEND_EXT)); linkname_ptr=0; /* Replace the current file */ - create_flag=MY_DELETE_OLD; + if (!(flags & HA_CREATE_KEEP_FILES)) + create_flag=MY_DELETE_OLD; } /* @@ -689,7 +690,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, fn_format(filename,name,"", MI_NAME_DEXT, MY_UNPACK_FILENAME | MY_APPEND_EXT); 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, |