diff options
| author |   jturner <jturner@openbsd.org> | 2015-03-16 00:08:23 +0000 |
|---|---|---|
| committer | jturner <jturner@openbsd.org> | 2015-03-16 00:08:23 +0000 |
| commit | a4904228c1f67d68dcbdd3f3c08820f4c91d30b5 (patch) | |
| tree | 0f3eb4e1c66eb0e6dbc0f93f4b5ea3c3eeecb1be /lib/libsqlite3/src/loadext.c | |
| parent | Update sqlite3 to 3.8.7.4. Changes available here: http://sqlite.org/changes.html#version_3_8_7_4 (diff) | |
| download | wireguard-openbsd-a4904228c1f67d68dcbdd3f3c08820f4c91d30b5.tar.xz wireguard-openbsd-a4904228c1f67d68dcbdd3f3c08820f4c91d30b5.zip | |
Merge conflicts
Diffstat (limited to 'lib/libsqlite3/src/loadext.c')
| -rw-r--r-- | lib/libsqlite3/src/loadext.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/libsqlite3/src/loadext.c b/lib/libsqlite3/src/loadext.c index 496c2ca81cb..776f08760ea 100644 --- a/lib/libsqlite3/src/loadext.c +++ b/lib/libsqlite3/src/loadext.c @@ -390,7 +390,20 @@ static const sqlite3_api_routines sqlite3Apis = { sqlite3_uri_int64, sqlite3_uri_parameter, sqlite3_vsnprintf, - sqlite3_wal_checkpoint_v2 + sqlite3_wal_checkpoint_v2, + /* Version 3.8.7 and later */ + sqlite3_auto_extension, + sqlite3_bind_blob64, + sqlite3_bind_text64, + sqlite3_cancel_auto_extension, + sqlite3_load_extension, + sqlite3_malloc64, + sqlite3_msize, + sqlite3_realloc64, + sqlite3_reset_auto_extension, + sqlite3_result_blob64, + sqlite3_result_text64, + sqlite3_strglob }; /* @@ -749,7 +762,7 @@ void sqlite3AutoLoadExtensions(sqlite3 *db){ sqlite3_mutex_leave(mutex); zErrmsg = 0; if( xInit && (rc = xInit(db, &zErrmsg, &sqlite3Apis))!=0 ){ - sqlite3Error(db, rc, + sqlite3ErrorWithMsg(db, rc, "automatic extension loading failed: %s", zErrmsg); go = 0; } |