Missing implementation for sqlite3TransferBindings(). (CVS 5675)

FossilOrigin-Name: 56d618957571f65e88375aad34a6e7dcf22508e1

diff --git a/manifest b/manifest
index aadcc4a9b99c4d4cbfbeffcb59b558d067752eed..8e231b1f566a04cf057fd6dc798f02c64dd12162 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sSQLITE_ENABLE_LOCKING_STYLE\sis\sdefined,\shave\sthe\sos_unix.c\smodule\soffer\sthe\sfollowing\sextra\sVFS\simplementations\sfor\sexplicitly\sselecting\sa\slocking-style:\s"unix-none",\s"unix-afp",\s"unix-posix",\s"unix-flock"\sand\s"unix-dotfile".\s(CVS\s5674)
-D 2008-09-04T06:22:26
+C Missing\simplementation\sfor\ssqlite3TransferBindings().\s(CVS\s5675)
+D 2008-09-04T12:03:43
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -141,7 +141,7 @@ F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8
 F src/pcache.c ff79cb5eb797d0f1a244b4332c2d39cb5cfd066b
 F src/pcache.h 53730c33310cdf7a5c94e8333c853d59a3b30226
 F src/pragma.c 9d00ed41b261968757c02707e1508a707f2d46a7
-F src/prepare.c ca08138fd2500fde0347013ab592b74376bb9f2c
+F src/prepare.c b708c5a8af1870145e93da88ec8f755e9e3efaf6
 F src/printf.c 785f87120589c1db672e37c6eb1087c456e6f84d
 F src/random.c 11bbdf7def3746a762fbdb56c9d04648135ad6d8
 F src/resolve.c a6abf83125bce0c80ba04acc27c3565155ad305c
@@ -190,7 +190,7 @@ F src/vacuum.c fd77433d0c26d3ff1eb96eab017a1787ac5aa642
 F src/vdbe.c ebc6f6bc8663ca00b6c7ed41bc464023dd6e0483
 F src/vdbe.h 41c99aaad9167c1b5431993db446de74b2f71fc3
 F src/vdbeInt.h b48c74d86a9fb62b707a3186ccca76bb32f1c6be
-F src/vdbeapi.c 3c98fbed9d4e10a4fbe09fce47e88ec567927a7b
+F src/vdbeapi.c c0f87aabb2bcf8c760ff9cb289119f7f6ba1797a
 F src/vdbeaux.c 45a53a4459c01db4e6befc977952346bfef405c3
 F src/vdbeblob.c f93110888ddc246215e9ba1f831d3d375bfd8355
 F src/vdbefifo.c 20fda2a7c4c0bcee1b90eb7e545fefcdbf2e1de7
@@ -630,7 +630,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 690ff3853b4e46ac7126992c84455237e265fd98
-R 0f5ed9d191e9832134b124328b6cfac0
-U danielk1977
-Z 94594e2b25c952001e1b9d2c3bf01277
+P 6e8fb64639cc7451005d9f1dd2d0ef62576abbdd
+R 5354b80b6c29c8fa14951a33a49c97ef
+U shane
+Z 9e93d129d3e209d52e4ed523c9876f35

diff --git a/manifest.uuid b/manifest.uuid
index 36e8d457b7da58d0eaa7eaccad65270369db48c3..5ff66dda4cd0c720c5a9be701166cc42de38aba1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e8fb64639cc7451005d9f1dd2d0ef62576abbdd
\ No newline at end of file
+56d618957571f65e88375aad34a6e7dcf22508e1
\ No newline at end of file

diff --git a/src/prepare.c b/src/prepare.c
index c1ede067fbf86c8f49564bb2f6e412a72cb467ef..b792b12f35890f6bb4566717e7cb1e9540e25534 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -13,7 +13,7 @@
 ** interface, and routines that contribute to loading the database schema
 ** from disk.
 **
-** $Id: prepare.c,v 1.95 2008/09/04 05:53:45 danielk1977 Exp $
+** $Id: prepare.c,v 1.96 2008/09/04 12:03:43 shane Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -692,7 +692,7 @@ int sqlite3Reprepare(Vdbe *p){
     assert( pNew!=0 );
   }
   sqlite3VdbeSwap((Vdbe*)pNew, p);
-  sqlite3_transfer_bindings(pNew, (sqlite3_stmt*)p);
+  sqlite3TransferBindings(pNew, (sqlite3_stmt*)p);
   sqlite3VdbeResetStepResult((Vdbe*)pNew);
   sqlite3VdbeFinalize((Vdbe*)pNew);
   return 1;

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index cc09f072fcac3a9ae64b361d9a45dd392fcebc4e..2ce388c1ca2bf6f11d08e60593af97b88185d315 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -13,7 +13,7 @@
 ** This file contains code use to implement APIs that are part of the
 ** VDBE.
 **
-** $Id: vdbeapi.c,v 1.140 2008/08/21 12:19:44 danielk1977 Exp $
+** $Id: vdbeapi.c,v 1.141 2008/09/04 12:03:43 shane Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -1227,7 +1227,7 @@ int sqlite3_bind_parameter_index(sqlite3_stmt *pStmt, const char *zName){
 ** If the two statements contain a different number of bindings, then
 ** an SQLITE_ERROR is returned.
 */
-int sqlite3_transfer_bindings(sqlite3_stmt *pFromStmt, sqlite3_stmt *pToStmt){
+int sqlite3TransferBindings(sqlite3_stmt *pFromStmt, sqlite3_stmt *pToStmt){
   Vdbe *pFrom = (Vdbe*)pFromStmt;
   Vdbe *pTo = (Vdbe*)pToStmt;
   int i, rc = SQLITE_OK;
@@ -1248,6 +1248,14 @@ int sqlite3_transfer_bindings(sqlite3_stmt *pFromStmt, sqlite3_stmt *pToStmt){
   return rc;
 }
 
+/*
+** Deprecated external interface.  Internal/core SQLite code
+** should call sqlite3TransferBindings.
+*/
+int sqlite3_transfer_bindings(sqlite3_stmt *pFromStmt, sqlite3_stmt *pToStmt){
+  return sqlite3TransferBindings(pFromStmt, pToStmt);
+}
+
 /*
 ** Return the sqlite3* database handle to which the prepared statement given
 ** in the argument belongs.  This is the same database handle that was