summaryrefslogtreecommitdiff
path: root/mysys/my_open.c
diff options
context:
space:
mode:
authorunknown <guilhem@gbichot3.local>2006-12-20 00:00:46 +0100
committerunknown <guilhem@gbichot3.local>2006-12-20 00:00:46 +0100
commit8b998d1199d53baf002f6ad725fa69e4b2f6813b (patch)
tree335d7c85728da44b45a4541bf523c09f0ab36f13 /mysys/my_open.c
parent8a2b3baaa9da6b94f0f609c1959ad00929ec7621 (diff)
parentc2f2a41ed32522fa89f5c79fec42ab60e0b4aa62 (diff)
downloadmariadb-git-8b998d1199d53baf002f6ad725fa69e4b2f6813b.tar.gz
Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean
into gbichot3.local:/home/mysql_src/mysql-maria BitKeeper/etc/ignore: auto-union BUILD/SETUP.sh: Auto merged Makefile.am: Auto merged configure.in: Auto merged BitKeeper/triggers/post-commit: merge include/Makefile.am: merge include/my_global.h: merge include/my_sys.h: merge libmysql/Makefile.shared: merge libmysqld/Makefile.am: merge mysql-test/mysql-test-run.pl: merge mysys/Makefile.am: merge mysys/mf_keycache.c: merge mysys/mf_keycaches.c: merge mysys/my_handler.c: merge mysys/my_init.c: merge mysys/my_open.c: merge mysys/my_pread.c: merge sql/Makefile.am: merge sql/handler.h: merge sql/item_func.cc: merge sql/item_func.h: merge sql/log.cc: merge sql/mysql_priv.h: merge sql/mysqld.cc: merge sql/set_var.cc: merge sql/sql_class.h: merge sql/sql_parse.cc: merge sql/sql_select.cc: merge sql/sql_test.cc: merge sql/unireg.cc: merge storage/csv/ha_tina.cc: merge storage/myisam/ft_boolean_search.c: merge storage/myisam/ha_myisam.cc: merge storage/myisam/ha_myisam.h: merge storage/myisam/mi_create.c: merge storage/myisam/mi_delete.c: merge storage/myisam/mi_dynrec.c: merge storage/myisam/mi_key.c: merge storage/myisam/mi_open.c: merge storage/myisam/mi_test2.c: merge storage/myisam/mi_unique.c: merge storage/myisam/mi_write.c: merge storage/myisam/myisamchk.c: merge storage/myisam/myisampack.c: merge storage/myisam/sort.c: merge unittest/mytap/tap.c: merge
Diffstat (limited to 'mysys/my_open.c')
-rw-r--r--mysys/my_open.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_open.c b/mysys/my_open.c
index a023a5ebe63..9bd55f3a584 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -162,6 +162,7 @@ File my_register_filename(File fd, const char *FileName, enum file_type
}
pthread_mutex_unlock(&THR_LOCK_open);
(void) my_close(fd, MyFlags);
+ fd= -1;
my_errno=ENOMEM;
}
else