From 036b689f187361848a315a192a83556256c0fe96 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Tue, 18 Apr 2017 11:29:02 +0200
Subject: MDEV-12310 openat(<directory>, ...O_EXEC) fails on Illumos / Solaris

it could be
* O_SEARCH on Illumos
* O_EXEC on FreeBSD
* O_PATH on Linux
ugh
---
 mysys/mysys_priv.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'mysys/mysys_priv.h')

diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
index 4b489504c26..661c4c184f1 100644
--- a/mysys/mysys_priv.h
+++ b/mysys/mysys_priv.h
@@ -89,9 +89,13 @@ void sf_free(void *ptr);
 
 void my_error_unregister_all(void);
 
-#if !defined(O_PATH) && defined(O_EXEC) /* FreeBSD */
+#ifndef O_PATH        /* not Linux */
+#if defined(O_SEARCH) /* Illumos */
+#define O_PATH O_SEARCH
+#elif defined(O_EXEC) /* FreeBSD */
 #define O_PATH O_EXEC
 #endif
+#endif
 
 #ifdef O_PATH
 #define HAVE_OPEN_PARENT_DIR_NOSYMLINKS
-- 
cgit v1.2.1