diff options
| author | beech <beech@FreeBSD.org> | 2009-01-09 15:10:43 +0800 |
|---|---|---|
| committer | beech <beech@FreeBSD.org> | 2009-01-09 15:10:43 +0800 |
| commit | 2e55998ab416e8fd1fcf0dee4e0869be9d336306 (patch) | |
| tree | 83cb693fcc1b3fa893e0b3dcf1b9e16e9ddc9d7a /databases | |
| parent | de92e3e276a4c70acf1bc10efafa126fcd1ccad8 (diff) | |
| download | freebsd-ports-gnome-2e55998ab416e8fd1fcf0dee4e0869be9d336306.tar.gz freebsd-ports-gnome-2e55998ab416e8fd1fcf0dee4e0869be9d336306.tar.zst freebsd-ports-gnome-2e55998ab416e8fd1fcf0dee4e0869be9d336306.zip | |
- Fix build
- Bump portrevision
PR: ports/129629 [1]
PR: ports/130308 [2]
Submitted by: RandomUser <rannumgen@globaleyes.net> [1]
Submitted by: Dan Caescu <daniel@freebsd.ro> [2]
Approved by: maintainer timeout (2+ weeks)
Diffstat (limited to 'databases')
4 files changed, 46 insertions, 1 deletions
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile index 13a81127deda..6467a19a75d7 100644 --- a/databases/mysql-connector-odbc/Makefile +++ b/databases/mysql-connector-odbc/Makefile @@ -7,7 +7,8 @@ PORTNAME= mysql-connector-odbc PORTVERSION= 3.51.26 -DISTVERSIONSUFFIX= r1127 +DISTVERSIONSUFFIX= r1127 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= Connector-ODBC/3.51 diff --git a/databases/mysql-connector-odbc/files/patch-driver_myodbc3.h b/databases/mysql-connector-odbc/files/patch-driver_myodbc3.h new file mode 100644 index 000000000000..98509d0c9cf7 --- /dev/null +++ b/databases/mysql-connector-odbc/files/patch-driver_myodbc3.h @@ -0,0 +1,22 @@ +--- driver/myodbc3.h.orig 2008-07-02 06:43:38.000000000 -0800 ++++ driver/myodbc3.h 2009-01-08 11:59:38.000000000 -0900 +@@ -161,7 +161,7 @@ + #define FLAG_MIN_DATE_TO_ZERO (1 << 25) /* Convert ODBC min date to 0000-00-00 on query */ + #define FLAG_MULTI_STATEMENTS (1 << 26) /* Allow multiple statements in a query */ + #define FLAG_COLUMN_SIZE_S32 (1 << 27) /* Limit column size to a signed 32-bit value (automatically set for ADO) */ +-#define FLAG_NO_BINARY_RESULT (1 << 28) /* Disables charset 63 for columns with empty org_table */
++#define FLAG_NO_BINARY_RESULT (1 << 28) /* Disables charset 63 for columns with empty org_table */ + + /* We don't make any assumption about what the default may be. */ + #ifndef DEFAULT_TXN_ISOLATION +@@ -252,8 +252,8 @@ + SQLINTEGER ValueMax; + SQLLEN * actual_len; + SQLINTEGER value_length; +- bool alloced,used; +- bool real_param_done; ++ my_bool alloced,used; ++ my_bool real_param_done; + } PARAM_BIND; + + diff --git a/databases/mysql-connector-odbc/files/patch-driver_myutil.h b/databases/mysql-connector-odbc/files/patch-driver_myutil.h new file mode 100644 index 000000000000..f1511754f08e --- /dev/null +++ b/databases/mysql-connector-odbc/files/patch-driver_myutil.h @@ -0,0 +1,11 @@ +--- driver/myutil.h.orig 2008-04-11 01:58:44.000000000 -0800 ++++ driver/myutil.h 2009-01-08 11:50:41.000000000 -0900 +@@ -174,7 +174,7 @@ + SQLLEN *pcbValue); + SQLRETURN SQL_API my_SQLExtendedFetch(SQLHSTMT hstmt, SQLUSMALLINT fFetchType, + SQLROWOFFSET irow, SQLULEN *pcrow, +- SQLUSMALLINT FAR *rgfRowStatus, bool upd_status); ++ SQLUSMALLINT FAR *rgfRowStatus, my_bool upd_status); + SQLRETURN copy_stmt_error(STMT FAR *src, STMT FAR *dst); + int unireg_to_c_datatype(MYSQL_FIELD *field); + int default_c_type(int sql_data_type); diff --git a/databases/mysql-connector-odbc/files/patch-driver_results.c b/databases/mysql-connector-odbc/files/patch-driver_results.c new file mode 100644 index 000000000000..fa6b4e9ab290 --- /dev/null +++ b/databases/mysql-connector-odbc/files/patch-driver_results.c @@ -0,0 +1,11 @@ +--- driver/results.c.orig 2008-04-11 01:58:44.000000000 -0800 ++++ driver/results.c 2009-01-08 11:46:27.000000000 -0900 +@@ -1248,7 +1248,7 @@ + SQLROWOFFSET irow, + SQLULEN *pcrow, + SQLUSMALLINT FAR *rgfRowStatus, +- bool upd_status ) ++ my_bool upd_status ) + { + ulong rows_to_fetch; + long cur_row, max_row; |