From: Dan Kalowsky <kalowsky@php.net>
Date: Tue, 8 May 2001 19:47:20 +0000 (+0000)
Subject: this is a fix for bug 10250.  it basically provides the unixODBC driver with
X-Git-Tag: php-4.0.6RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3a509ac9e8e942f4c5a1cbff8d529593cdd938f;p=php

this is a fix for bug 10250.  it basically provides the unixODBC driver with
access to the SQLDriver functions.  patch originally submitted by
dzoll@nyscul.org, and is going to be tested by some of the unixODBC people.
---

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 94a6cb11f3..06af9a029e 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1919,11 +1919,11 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int
 			return FALSE;
 		}
 	}
-/*  Possible fix for bug #
- *  Needs testing on UnixODBC < 2.0.5 though.
- *	 #if defined(HAVE_EMPRESS) || defined(HAVE_UNIXODBC)
- *  Uncomment the line above, and comment line below to fully test */
-#ifdef HAVE_EMPRESS
+/*  Possible fix for bug #10250
+ *  Needs testing on UnixODBC < 2.0.5 though. */
+ #if defined(HAVE_EMPRESS) || defined(HAVE_UNIXODBC)
+/* *  Uncomment the line above, and comment line below to fully test 
+ * #ifdef HAVE_EMPRESS */
 	{
 		int     direct = 0;
 		char    dsnbuf[300];