summaryrefslogtreecommitdiff
path: root/mysys/my_lib.c
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-14 19:50:56 +0300
committermonty@hundin.mysql.fi <>2001-09-14 19:50:56 +0300
commit52b83ea21855d3a5e5febece2783c27147ef3a6a (patch)
treece2c2bb8f39cfadb29246ea7e2859e120d65f0ec /mysys/my_lib.c
parentc87e072bce089f9f56b464033da1d26384580091 (diff)
downloadmariadb-git-52b83ea21855d3a5e5febece2783c27147ef3a6a.tar.gz
Fixed bug in UNION
Fixed replication bug in load_master_data
Diffstat (limited to 'mysys/my_lib.c')
-rw-r--r--mysys/my_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index d183be58231..55bd42381da 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -183,7 +183,7 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
my_errno=errno;
if (dirp)
(void) closedir(dirp);
- if (MyFlags & (MY_FAE+MY_WME))
+ if (MyFlags & (MY_FAE | MY_WME))
my_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,my_errno);
DBUG_RETURN((MY_DIR *) NULL);
} /* my_dir */