Hi, Alexey! I suggest a different fix: ====================================================================== diff --git a/plugin/type_mysql_json/type.cc b/plugin/type_mysql_json/type.cc index 61507a24d92..8b79e039106 100644 --- a/plugin/type_mysql_json/type.cc +++ b/plugin/type_mysql_json/type.cc @@ -14,8 +14,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ -#include <mysql/plugin_data_type.h> #include <my_global.h> +#include <mysql/plugin_data_type.h> #include <sql_type.h> #include <field.h> #include <mysqld_error.h> diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 30484a41087..868d30d2081 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -98,7 +98,7 @@ #pragma implementation // gcc: Class implementation #endif -#include <my_config.h> +#include <my_global.h> #include <mysql/plugin.h> #include "ha_example.h" #include "sql_class.h" ====================================================================== Let's just accept that *if* one wants to include my_global.h, it *has* to be included first. As Monty wants to be the case anyway. On Sep 14, Alexey Botchkov wrote:
Hi, Sergei.
Unfortunately the taken approach led to compiler errors on Windows and (seemingly) the rpl_shutdown_wait_slaves test failure. So i made the change - to preserve the way we do the includes. 76c4616c2cc47ecc85362d0c5a2bffd9495e4753
Best regards. HF
Regards, Sergei VP of MariaDB Server Engineering and security@mariadb.org