aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--odb/mysql/connection-factory.cxx2
-rw-r--r--odb/mysql/makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/odb/mysql/connection-factory.cxx b/odb/mysql/connection-factory.cxx
index a8d0caf..fb1b2cd 100644
--- a/odb/mysql/connection-factory.cxx
+++ b/odb/mysql/connection-factory.cxx
@@ -33,6 +33,8 @@
// 1. MySQL doesn't use the destructor itself.
// 2. Nobody else tried to call mysql_thread_end() before us.
//
+// Note: in 5.7 the key has been made static and is no longer accessible.
+//
#if defined(ODB_THREADS_POSIX) && defined(LIBODB_MYSQL_THR_KEY_VISIBLE)
extern pthread_key_t THR_KEY_mysys;
#endif
diff --git a/odb/mysql/makefile b/odb/mysql/makefile
index 6e547c2..ff5a17f 100644
--- a/odb/mysql/makefile
+++ b/odb/mysql/makefile
@@ -87,7 +87,7 @@ $(out_base)/details/config.h: | $(out_base)/details/.
@echo '#define ODB_MYSQL_DETAILS_CONFIG_H' >>$@
@echo '' >>$@
@echo '#define LIBODB_MYSQL_INCLUDE_LONG 1' >>$@
- @echo '#define LIBODB_MYSQL_THR_KEY_VISIBLE 1' >>$@
+# @echo '#define LIBODB_MYSQL_THR_KEY_VISIBLE 1' >>$@
@echo '' >>$@
@echo '#endif /* ODB_MYSQL_DETAILS_CONFIG_H */' >>$@