diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-10-02 11:57:40 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-02 11:57:40 +0200 |
| commit | aa36d9e74225f6db32fa01a8e1a2a3a6e6a5b77f (patch) | |
| tree | 67a18a7571770c9642be560f6316d04f211c2c13 /storage/federatedx | |
| parent | 02125587e12b761a6049c6cc5fc6a6c4b6ea7a10 (diff) | |
| download | mariadb-git-aa36d9e74225f6db32fa01a8e1a2a3a6e6a5b77f.tar.gz | |
MDEV-5120 Test suite test maria-no-logging fails
stat structure (from <sys/stat.h>) is conditionally defined
to have different layout and size depending on the defined macros.
The correct macro is defined in my_config.h, which means it MUST be
included first (or, at least before <features.h> - so, practically,
before including any system headers).
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/federatedx_io.cc | 1 | ||||
| -rw-r--r-- | storage/federatedx/federatedx_io_mysql.cc | 1 | ||||
| -rw-r--r-- | storage/federatedx/federatedx_io_null.cc | 1 | ||||
| -rw-r--r-- | storage/federatedx/federatedx_txn.cc | 1 | ||||
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/storage/federatedx/federatedx_io.cc b/storage/federatedx/federatedx_io.cc index 34d3dde3ebb..6c968cd7907 100644 --- a/storage/federatedx/federatedx_io.cc +++ b/storage/federatedx/federatedx_io.cc @@ -28,6 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /*#define MYSQL_SERVER 1*/ +#include <my_global.h> #include "sql_priv.h" #include <mysql/plugin.h> diff --git a/storage/federatedx/federatedx_io_mysql.cc b/storage/federatedx/federatedx_io_mysql.cc index c6a5732c564..a2eaa345a18 100644 --- a/storage/federatedx/federatedx_io_mysql.cc +++ b/storage/federatedx/federatedx_io_mysql.cc @@ -28,6 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define MYSQL_SERVER 1 +#include <my_global.h> #include "sql_priv.h" #include <mysql/plugin.h> diff --git a/storage/federatedx/federatedx_io_null.cc b/storage/federatedx/federatedx_io_null.cc index 4322422ef37..2b84d03808e 100644 --- a/storage/federatedx/federatedx_io_null.cc +++ b/storage/federatedx/federatedx_io_null.cc @@ -28,6 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /*#define MYSQL_SERVER 1*/ +#include <my_global.h> #include "sql_priv.h" #include <mysql/plugin.h> diff --git a/storage/federatedx/federatedx_txn.cc b/storage/federatedx/federatedx_txn.cc index 5049b1ff79f..d74ece32c61 100644 --- a/storage/federatedx/federatedx_txn.cc +++ b/storage/federatedx/federatedx_txn.cc @@ -31,6 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #define MYSQL_SERVER 1 +#include <my_global.h> #include "sql_priv.h" #include <mysql/plugin.h> diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 2231cd82a06..62199515ca9 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -312,6 +312,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #define MYSQL_SERVER 1 +#include <my_global.h> #include <mysql/plugin.h> #include "ha_federatedx.h" #include "sql_servers.h" |