cvs: /php4/ext/odbc php_odbc.c
| From: | Andreas Karajannis | Date: | Fri, 08 Oct 1999 19:43:59 +0000 |
| Subject: | cvs: /php4/ext/odbc php_odbc.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-5418@lists.php.net to get a copy of this message | ||
kara Fri Oct 8 15:43:59 1999 EDT
Modified files:
/php4/ext/odbc php_odbc.c
Log:
Forgot to remove workaround for SQLANY_BUG which is no longer needed
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.6 php4/ext/odbc/php_odbc.c:1.7
--- php4/ext/odbc/php_odbc.c:1.6 Fri Oct 8 15:35:50 1999
+++ php4/ext/odbc/php_odbc.c Fri Oct 8 15:43:27 1999
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.6 1999/10/08 19:35:50 kara Exp $ */
+/* $Id: php_odbc.c,v 1.7 1999/10/08 19:43:27 kara Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
@@ -317,29 +317,11 @@
#endif
REGISTER_INI_ENTRIES();
- /* SQLAllocEnv(&henv); */
le_result = register_list_destructors(_free_odbc_result, NULL);
le_conn = register_list_destructors(_close_odbc_conn, NULL);
le_pconn = register_list_destructors(NULL, _close_odbc_pconn);
odbc_module_entry.type = type;
-#ifdef SQLANY_BUG
- /* Make a dumb connection to avoid crash on SQLFreeEnv(),
- * then release it immediately.
- * This is required for SQL Anywhere 5.5.00 on QNX 4.24 at least.
- * The SQLANY_BUG should be defined in CFLAGS.
- */
- if(SQLAllocConnect(henv, &foobar) != SQL_SUCCESS){
- ODBC_SQL_ERROR(SQL_NULL_HDBC, SQL_NULL_HSTMT, "SQLAllocConnect");
- }else{
- rc = SQLConnect(foobar, ODBCG(defDB), SQL_NTS, ODBCG(defUser),
- SQL_NTS, ODBCG(defPW), SQL_NTS);
- if(rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO)
- SQLDisconnect(foobar);
- SQLFreeConnect(foobar);
- }
-#endif
-
REGISTER_LONG_CONSTANT("ODBC_BINMODE_PASSTHRU", 0, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ODBC_BINMODE_RETURN", 1, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ODBC_BINMODE_CONVERT", 2, CONST_CS | CONST_PERSISTENT);