diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-27 18:06:45 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-27 18:06:45 +0200 |
| commit | 28f395dfddc5070c3917f186d414e3b47a09f919 (patch) | |
| tree | f66e3eb2eb80284e107540ae06ecf8f57b7b58fa | |
| parent | b7a9147867e3b99e0bb44daffa3a2c6aec10ff4b (diff) | |
Update with notes/fixes for 5.7
| -rw-r--r-- | odb/mysql/connection-factory.cxx | 2 | ||||
| -rw-r--r-- | odb/mysql/makefile | 2 |
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 */' >>$@ |