forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-db/mysql++: Fix build for Bug 629492 and general build cleanup
Installed files are unchanged Package-Manager: Portage-2.3.8, Repoman-2.3.3
- Loading branch information
Brian Evans
committed
Sep 1, 2017
1 parent
a900af2
commit 080a631
Showing
2 changed files
with
46 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp | ||
--- mysql++-3.2.2-ORIG/lib/dbdriver.cpp 2017-07-14 14:56:06.206629443 +0200 | ||
+++ mysql++-3.2.2/lib/dbdriver.cpp 2017-07-14 15:28:34.690826959 +0200 | ||
@@ -257,7 +257,11 @@ | ||
} | ||
|
||
if ((n == 1) && | ||
+#ifdef CLIENT_LONG_PASSWORD | ||
(o >= CLIENT_LONG_PASSWORD) && | ||
+#else | ||
+ (o >= CLIENT_MYSQL) && | ||
+#endif | ||
#if MYSQL_VERSION_ID > 40000 // highest flag value varies by version | ||
(o <= CLIENT_MULTI_RESULTS) | ||
#else | ||
diff -aurN a/lib/common.h b/lib/common.h | ||
--- a/lib/common.h 2016-12-30 18:44:44.000000000 -0500 | ||
+++ b/lib/common.h 2017-09-01 09:12:12.270089396 -0400 | ||
@@ -130,12 +130,6 @@ | ||
#define MYSQLPP_PATH_SEPARATOR '/' | ||
#endif | ||
|
||
-#if defined(MYSQLPP_MYSQL_HEADERS_BURIED) | ||
-# include <mysql/mysql_version.h> | ||
-#else | ||
-# include <mysql_version.h> | ||
-#endif | ||
- | ||
namespace mysqlpp { | ||
|
||
/// \brief Alias for 'true', to make code requesting exceptions more |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters