|
@@ -12,12 +12,12 @@
|
|
|
#include "winapi.hpp"
|
|
#include "winapi.hpp"
|
|
|
#endif
|
|
#endif
|
|
|
#include <mysql.h>
|
|
#include <mysql.h>
|
|
|
-#include <mysql_version.h>
|
|
|
|
|
#include <stdlib.h>// strtoul
|
|
#include <stdlib.h>// strtoul
|
|
|
|
|
|
|
|
// MySQL 8.0 or later removed my_bool typedef.
|
|
// MySQL 8.0 or later removed my_bool typedef.
|
|
|
// Reintroduce it as a bandaid fix.
|
|
// Reintroduce it as a bandaid fix.
|
|
|
-#if MYSQL_VERSION_ID >= 80000
|
|
|
|
|
|
|
+// See https://bugs.mysql.com/?id=87337
|
|
|
|
|
+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002
|
|
|
#define my_bool bool
|
|
#define my_bool bool
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
Lemongrass3110