7 files changed, 90 insertions, 14 deletions

diff --git a/databases/mysql-connector-odbc/files/myodbc-iodbc-patch b/databases/mysql-connector-odbc/files/myodbc-iodbc-patch
index bdb641e84a0d..a96f83af97d2 100644
--- a/databases/mysql-connector-odbc/files/myodbc-iodbc-patch
+++ b/databases/mysql-connector-odbc/files/myodbc-iodbc-patch
@@ -1,11 +1,11 @@
---- driver/results.c.orig	Sun Feb 27 00:59:11 2005
-+++ driver/results.c	Sun Feb 27 00:59:19 2005
-@@ -544,7 +544,7 @@
- 		SQLPOINTER  CharacterAttributePtr,
- 		SQLSMALLINT BufferLength,
- 		SQLSMALLINT *StringLengthPtr,
--		SQLPOINTER  NumericAttributePtr)
-+		SQLLEN * NumericAttributePtr)
+--- driver/results.c.orig	Sun Oct  9 22:33:40 2005
++++ driver/results.c	Thu Oct 27 16:30:17 2005
+@@ -558,7 +558,7 @@
+                                    SQLPOINTER  CharacterAttributePtr,
+                                    SQLSMALLINT BufferLength,
+                                    SQLSMALLINT *StringLengthPtr,
+-                                   SQLPOINTER  NumericAttributePtr )
++                                   SQLLEN *NumericAttributePtr )
+ #endif
  {
-   return get_col_attr(StatementHandle, ColumnNumber,
- 		      FieldIdentifier, CharacterAttributePtr,
+     return get_col_attr( StatementHandle, 
diff --git a/databases/mysql-connector-odbc/files/patch-configure b/databases/mysql-connector-odbc/files/patch-configure
new file mode 100644
index 000000000000..0670e2b213ef
--- /dev/null
+++ b/databases/mysql-connector-odbc/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	Sat Oct 29 20:43:26 2005
++++ configure	Sat Oct 29 21:00:14 2005
+@@ -1650,11 +1650,11 @@
+ 
+ # The aliases save the names the user supplied, while $host etc.
+ # will get canonicalized.
+-test -n "$target_alias" &&
+-  test "$program_prefix$program_suffix$program_transform_name" = \
+-    NONENONEs,x,x, &&
+-  program_prefix=${target_alias}-
+-am__api_version="1.9"
++# test -n "$target_alias" &&
++#   test "$program_prefix$program_suffix$program_transform_name" = \
++#     NONENONEs,x,x, &&
++#   program_prefix=${target_alias}-
++# am__api_version="1.9"
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
diff --git a/databases/mysql-connector-odbc/files/patch-driver__connect.c b/databases/mysql-connector-odbc/files/patch-driver__connect.c
new file mode 100644
index 000000000000..d0b493d5e674
--- /dev/null
+++ b/databases/mysql-connector-odbc/files/patch-driver__connect.c
@@ -0,0 +1,14 @@
+--- driver/connect.c.orig	Sun Oct  9 22:33:40 2005
++++ driver/connect.c	Thu Oct 27 16:44:37 2005
+@@ -141,8 +141,10 @@
+     client_flag |=  CLIENT_COMPRESS;
+   if (option_flag & FLAG_IGNORE_SPACE)
+     client_flag |=  CLIENT_IGNORE_SPACE;
+-    
++
++#ifdef CLIENT_MULTI_RESULTS
+   client_flag |= CLIENT_MULTI_RESULTS;
++#endif
+ #ifdef __WIN__
+   if (option_flag & FLAG_NAMED_PIPE)
+     mysql_options(mysql,MYSQL_OPT_NAMED_PIPE,NullS);
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..6440ea8a2433
--- /dev/null
+++ b/databases/mysql-connector-odbc/files/patch-driver__myodbc3.h
@@ -0,0 +1,15 @@
+--- driver/myodbc3.h.orig	Sun Oct  9 22:33:40 2005
++++ driver/myodbc3.h	Thu Oct 27 16:16:05 2005
+@@ -101,7 +101,12 @@
+ #include <ltdl.h>
+ #include <sql.h>
+ #include <sqlext.h>
++
++# if defined(HAVE_IODBCINST_H)
++#include <iodbcinst.h>
++#elif defined(HAVE_ODBCINST_H)
+ #include <odbcinst.h>
++# endif
+ 
+ #ifndef SYSTEM_ODBC_INI
+ #define BOTH_ODBC_INI ODBC_BOTH_DSN
diff --git a/databases/mysql-connector-odbc/files/patch-myodbcinst__myodbcinst.c b/databases/mysql-connector-odbc/files/patch-myodbcinst__myodbcinst.c
new file mode 100644
index 000000000000..7f20ed71147f
--- /dev/null
+++ b/databases/mysql-connector-odbc/files/patch-myodbcinst__myodbcinst.c
@@ -0,0 +1,14 @@
+--- myodbcinst/myodbcinst.c.orig	Mon Oct 10 05:49:47 2005
++++ myodbcinst/myodbcinst.c	Thu Oct 27 16:33:29 2005
+@@ -56,7 +56,11 @@
+     #include <ltdl.h>
+ #endif
+ 
++# if defined(HAVE_IODBCINST_H)
++#include <iodbcinst.h>
++#elif defined(HAVE_ODBCINST_H)
+ #include <odbcinst.h>
++# endif
+ 
+ #include "../util/MYODBCUtil.h"
+ 
diff --git a/databases/mysql-connector-odbc/files/patch-strndup b/databases/mysql-connector-odbc/files/patch-strndup
index 637906a4d474..bf424d5d5df6 100644
--- a/databases/mysql-connector-odbc/files/patch-strndup
+++ b/databases/mysql-connector-odbc/files/patch-strndup
@@ -1,11 +1,11 @@
---- util/MYODBCUtilReadDataSourceStr.c.orig	Wed Feb  2 05:01:28 2005
-+++ util/MYODBCUtilReadDataSourceStr.c	Sat Mar  5 02:05:08 2005
+--- util/MYODBCUtilReadDataSourceStr.c.orig	Sun Oct  9 22:33:40 2005
++++ util/MYODBCUtilReadDataSourceStr.c	Thu Oct 27 16:35:43 2005
 @@ -20,7 +20,7 @@
  
  #include "MYODBCUtil.h"
  
--#if defined(__APPLE__) || defined(WIN32) || defined(__SPARC__)
-+#if defined(__APPLE__) || defined(WIN32) || defined(__SPARC__) || defined(__FreeBSD__)
+-#if defined(__APPLE__) || defined(WIN32) || defined(__sparc)
++#if defined(__APPLE__) || defined(WIN32) || defined(__sparc) || defined(__FreeBSD__)
  char *strndup( const char *s, size_t n )
  {
      size_t nAvail;
diff --git a/databases/mysql-connector-odbc/files/patch-util__MYODBCUtil.h b/databases/mysql-connector-odbc/files/patch-util__MYODBCUtil.h
new file mode 100644
index 000000000000..09de6e39a079
--- /dev/null
+++ b/databases/mysql-connector-odbc/files/patch-util__MYODBCUtil.h
@@ -0,0 +1,14 @@
+--- util/MYODBCUtil.h.orig	Sun Oct  9 22:33:40 2005
++++ util/MYODBCUtil.h	Thu Oct 27 16:13:47 2005
+@@ -40,7 +40,11 @@
+ #include <sqlext.h>
+ #endif
+ 
++# if defined(HAVE_IODBCINST_H)
++#include <iodbcinst.h>
++#elif defined(HAVE_ODBCINST_H)
+ #include <odbcinst.h>
++# endif
+ 
+ /* 
+     Handle case on OSX where we want to use GetPrivateProfileString (because it