lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-11-26 10:29:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch odbclink.diff from Nirgal

Browse Source
This commit is contained in:
Nirgal Vourgre
2011-08-28 19:55:04 -04:00
committed by Brian Bruns
parent b38931b9d9
commit 7656d25aaf
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/odbc/Makefile.am
View File

@@ -11,11 +11,7 @@ noinst_PROGRAMS = unittest
lib_LTLIBRARIES = libmdbodbc.la lib_LTLIBRARIES = libmdbodbc.la
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
libmdbodbc_la_SOURCES= odbc.c connectparams.c libmdbodbc_la_SOURCES= odbc.c connectparams.c
libmdbodbc_la_LIBADD= $(patsubst %, $(SQLDIR)/%, \ libmdbodbc_la_LIBADD= ../libmdb/libmdb.la ../sql/libmdbsql.la
$(patsubst %.c, %.lo, $(SQLSOURCES))) \
$(patsubst %, $(MDBDIR)/%, \
$(patsubst %.c, %.lo, $(MDBSOURCES))) \
../libmdb/libmdb.la
libmdbodbc_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libmdbodbc.map libmdbodbc_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libmdbodbc.map
LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la

9
src/odbc/odbc.c
View File

@@ -960,13 +960,8 @@ static SQLRETURN SQL_API _SQLExecute( SQLHSTMT hstmt)
mdb_sql_reset(env->sql); mdb_sql_reset(env->sql);
/* calls to yyparse would need to be serialized for thread safety */ mdb_sql_run_query(env->sql, stmt->query);
if (mdb_sql_has_error(env->sql)) {
/* begin unsafe */
g_input_ptr = stmt->query;
_mdb_sql(env->sql);
if (yyparse()) {
/* end unsafe */
LogError("Couldn't parse SQL\n"); LogError("Couldn't parse SQL\n");
mdb_sql_reset(env->sql); mdb_sql_reset(env->sql);
return SQL_ERROR; return SQL_ERROR;