diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-14 19:50:56 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-14 19:50:56 +0300 |
| commit | af19fa462856d517d3a35737389f432fe071a4f6 (patch) | |
| tree | ce2c2bb8f39cfadb29246ea7e2859e120d65f0ec /mysys/my_lib.c | |
| parent | cca506652121877c21e973baae7c815a8f005e34 (diff) | |
| download | mariadb-git-af19fa462856d517d3a35737389f432fe071a4f6.tar.gz | |
Fixed bug in UNION
Fixed replication bug in load_master_data
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Delete: include/global.h
Docs/manual.texi:
Cleaned up "Things to do in 4.0"
mysql-test/r/union.result:
New test
mysql-test/t/union.test:
New test
mysys/my_lib.c:
Cleanup
sql/mysql_priv.h:
Fixed replication bug load_master_data
sql/sql_base.cc:
Fixed bug in UNION
sql/sql_db.cc:
Fixed replication bug load_master_data
sql/sql_parse.cc:
Fixed replication bug load_master_data
sql/sql_repl.cc:
Fixed replication bug load_master_data
sql/sql_union.cc:
Fixed bug in UNION
tools/mysqlmanager.c:
Portability fix
Diffstat (limited to 'mysys/my_lib.c')
| -rw-r--r-- | mysys/my_lib.c | 2 |
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 */ |