summaryrefslogtreecommitdiff
path: root/databases/mysql-connector-c++/files
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2012-08-09 09:24:28 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2012-08-09 09:24:28 +0000
commit7c679160754fe87dfa27195690822a414b2b3b62 (patch)
tree2928ca9d49a099611d88c504d2e37d4f1c99059c /databases/mysql-connector-c++/files
parentDon't use /var/tmp/ for storing ipc files, (diff)
- Update to 1.1.1
Changes: * DatabaseMetaData::getSQLKeywords() updated to match MySQL 5.5. Note that C/C++, just like C/JDBC, returns the same list for every MySQL database version. (Ulf) * Added MySQL_Connection::getLastStatementInfo() which returns back the value of the mysql_info() function of libmysql / Connector/C. (Andrey) * Added new method ResultSetMetaData::isNumeric() and implemented it in all classes that subclass from it. (Andrey) * Fixed the bug causing compilation errors in Microsoft Visual Studio 2010 if stdint.h was included. See http://bugs.mysql.com/bug.php?id=60307 * Fixed bug making statement that did not raise any warning to return warnings from previously executed statement. * Fixed stores(Lower|Mixed)Case(Quoted)Identifiers methods. * Built against libmysql 5.5.27 enabling support of authentification plugins and IPv6.
Notes
Notes: svn path=/head/; revision=302334
Diffstat (limited to 'databases/mysql-connector-c++/files')
-rw-r--r--databases/mysql-connector-c++/files/patch-CMakeLists.txt28
-rw-r--r--databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt8
2 files changed, 16 insertions, 20 deletions
diff --git a/databases/mysql-connector-c++/files/patch-CMakeLists.txt b/databases/mysql-connector-c++/files/patch-CMakeLists.txt
index 635e357410b9..037d047e0aa0 100644
--- a/databases/mysql-connector-c++/files/patch-CMakeLists.txt
+++ b/databases/mysql-connector-c++/files/patch-CMakeLists.txt
@@ -1,21 +1,17 @@
---- CMakeLists.txt.orig 2010-09-10 11:47:48.000000000 +0200
-+++ CMakeLists.txt 2011-11-21 16:42:10.000000000 +0100
-@@ -225,7 +225,6 @@
+--- CMakeLists.txt.orig 2012-08-09 10:44:22.000000000 +0200
++++ CMakeLists.txt 2012-08-09 10:46:37.000000000 +0200
+@@ -252,14 +252,6 @@
SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
ENDIF(WIN32)
--INSTALL(FILES ${CPACK_RESOURCE_FILE_README} ${CPACK_RESOURCE_FILE_LICENSE} "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" DESTINATION "." OPTIONAL)
-
+-INSTALL(FILES
+- ${CPACK_RESOURCE_FILE_README}
+- ${CPACK_RESOURCE_FILE_INSTALL}
+- ${CPACK_RESOURCE_FILE_LICENSE}
+- "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
+- "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
+- DESTINATION "." OPTIONAL)
+-
SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
-@@ -252,6 +252,10 @@
- ENDIF(WIN32)
- MESSAGE(STATUS "Installation path is: ${CMAKE_INSTALL_PREFIX} (overwrite with -DCMAKE_INSTALL_PREFIX=/your/path)")
-
-+# this is where generated config.h files are placed
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
-
- ADD_SUBDIRECTORY(cppconn)
- ADD_SUBDIRECTORY(driver)
+ "install_manifest.txt")
diff --git a/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt b/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt
index 8bafe1851e38..3d5a1d333bae 100644
--- a/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt
+++ b/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt
@@ -1,6 +1,6 @@
---- cppconn/CMakeLists.txt.orig 2011-11-21 16:34:57.000000000 +0100
-+++ cppconn/CMakeLists.txt 2011-11-21 16:36:39.000000000 +0100
-@@ -55,7 +55,6 @@
+--- cppconn/CMakeLists.txt.orig 2012-08-09 10:30:25.000000000 +0200
++++ cppconn/CMakeLists.txt 2012-08-09 10:31:01.000000000 +0200
+@@ -58,7 +58,6 @@
SET(MYSQLCPPCONN_INSTALL_HEADERS
build_config.h
@@ -8,7 +8,7 @@
connection.h
datatype.h
driver.h
-@@ -70,3 +69,4 @@
+@@ -73,3 +72,4 @@
warning.h)
INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/cppconn)