summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2007-07-11 12:37:47 +0300
committerunknown <gkodinov/kgeorge@magare.gmz>2007-07-11 12:37:47 +0300
commit3881f2a24dd531077d99b9a646c437d98e05c994 (patch)
tree31e9fe71da5661d29b8f1b35d8dbda8058777098 /myisam
parent2b1fb350c340142cea7ed635a92f3e56fac97a26 (diff)
downloadmariadb-git-3881f2a24dd531077d99b9a646c437d98e05c994.tar.gz
fixed uninitialized variable introduced by the fix for bug 29325
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_create.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/myisam/mi_create.c b/myisam/mi_create.c
index dd8a5b0d525..75863ed976f 100644
--- a/myisam/mi_create.c
+++ b/myisam/mi_create.c
@@ -586,8 +586,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
32 : 0));
linkname_ptr=0;
/* Replace the current file */
- if (!(flags & HA_CREATE_KEEP_FILES))
- create_flag=MY_DELETE_OLD;
+ create_flag=(flags & HA_CREATE_KEEP_FILES) ? 0 : MY_DELETE_OLD;
}
/*
@@ -648,8 +647,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
{
fn_format(filename,name,"",MI_NAME_DEXT,4);
linkname_ptr=0;
- if (!(flags & HA_CREATE_KEEP_FILES))
- create_flag=MY_DELETE_OLD;
+ create_flag=(flags & HA_CREATE_KEEP_FILES) ? 0 : MY_DELETE_OLD;
}
if ((dfile=
my_create_with_symlink(linkname_ptr, filename, 0, create_mode,