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/tabxml.cpp b/storage/connect/tabxml.cpp
index d4cb0168ae7..5a465687521 100644
--- a/storage/connect/tabxml.cpp
+++ b/storage/connect/tabxml.cpp
@@ -388,7 +388,7 @@ int TDBXML::LoadTableFile(PGLOBAL g)
     // Parse the XML file

     if (Docp->ParseFile(filename)) {

       // Does the file exist?

-      int h = open(filename, _O_RDONLY);

+      int h= global_open(g, MSGID_NONE, filename, _O_RDONLY);

 

       rc = (h == -1 && errno == ENOENT) ? RC_NF : RC_INFO;

       if (h != -1) close(h);