Introducing functions global_open() and global_fopen() for these purposes:

- Removing duplicate code to generate error message text
- In the future they will most likely check secure_file_priv directory.


modified:
  storage/connect/filamdbf.cpp
  storage/connect/filamfix.cpp
  storage/connect/filamtxt.cpp
  storage/connect/filamvct.cpp
  storage/connect/libdoc.cpp
  storage/connect/maputil.cpp
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabmul.cpp
  storage/connect/tabxml.cpp
  storage/connect/xindex.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/storage/connect/maputil.cpp b/storage/connect/maputil.cpp
index 6f824e4cdda..d7389d26032 100644
--- a/storage/connect/maputil.cpp
+++ b/storage/connect/maputil.cpp
@@ -141,7 +141,7 @@ HANDLE CreateFileMap(PGLOBAL g, LPCSTR fileName,
    } // endswitch

 

   // Try to open the addressed file.

-	fd = open(fileName, openMode);

+   fd= global_open(g, MSGID_NONE, fileName, openMode);

 

 	if (fd != INVALID_HANDLE_VALUE && mode != MODE_INSERT) {

     /* We must know about the size of the file. */