simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-07 22:28:47 -04:00
Code Issues Releases Wiki Activity

not to store imp_dbh globally, which should fix RT-86006 under Win32 (ie. ithreads-enabled environments)

Browse source 
- This is a tentative fix. Ideally this should be stored in MY_CXT or something less global.
This commit is contained in:
Kenichi Ishigaki 2015-02-11 12:51:17 +09:00
parent eb10c7ce6f
commit 69d9a31fc0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dbdimp.c
View file

@ -27,7 +27,7 @@ DBISTATE_DECLARE;
/*-----------------------------------------------------* /*-----------------------------------------------------*
* Globals * Globals
*-----------------------------------------------------*/ *-----------------------------------------------------*/
imp_dbh_t *last_prepared_dbh; /* see _last_dbh_is_unicode() */ static int last_dbh_is_unicode; /* see _last_dbh_is_unicode() */
/*-----------------------------------------------------* /*-----------------------------------------------------*
@ -108,7 +108,7 @@ int _last_dbh_is_unicode() {
/* some functions need to know if the unicode flag is on, but /* some functions need to know if the unicode flag is on, but
don't have a dbh pointer ... so unfortunately the only way is don't have a dbh pointer ... so unfortunately the only way is
to use a global variable */ to use a global variable */
return last_prepared_dbh && last_prepared_dbh->unicode; return last_dbh_is_unicode;
} }
@ -682,7 +682,7 @@ sqlite_st_prepare_sv(SV *sth, imp_sth_t *imp_sth, SV *sv_statement, SV *attribs)
stmt_list_s * new_stmt; stmt_list_s * new_stmt;
D_imp_dbh_from_sth; D_imp_dbh_from_sth;
last_prepared_dbh = imp_dbh; last_dbh_is_unicode = imp_dbh->unicode;
if (!DBIc_ACTIVE(imp_dbh)) { if (!DBIc_ACTIVE(imp_dbh)) {
sqlite_error(sth, -2, "attempt to prepare on inactive database handle"); sqlite_error(sth, -2, "attempt to prepare on inactive database handle");