Minor simplification of schema error reporting.

FossilOrigin-Name: a8846aeed9992c6c9f1c8bd6e996a4cbe891751e

diff --git a/manifest b/manifest
index 667cb055a4a817680def3a1858403dc353c9b9c7..b94b629c43651a7a111bd6ecc88799a610cec23d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\sperformance\simprovements\sthat\sfall\sout\sof\sthe\smallocFailed\schanges.
-D 2016-02-05T02:42:54.123
+C Minor\ssimplification\sof\sschema\serror\sreporting.
+D 2016-02-05T02:50:11.825
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
@@ -343,7 +343,7 @@ F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
 F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
 F src/pragma.c 80ee77226d0008d9188356a6cbbe6010866e1bee
 F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
-F src/prepare.c db4ce553dd1f03909a01858a760fa293e0f32ca0
+F src/prepare.c c12b786713df3e8270c0f85f988c5359d8b4d87c
 F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
@@ -1426,7 +1426,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c3ef03478a5788c855b3aef385d43ae7f494f440
-R 84df2aaa23afa82bffc643c1855a9e65
+P d94416ddca8f7ed727dd335d38155ea5945a86b7
+R 93de80b6f41eca5b247f8cd43a03611d
 U drh
-Z 8d53cc14407430cf1880951ea3d679f2
+Z 30d13b253cef6bc68465b8bc6d2bab02

diff --git a/manifest.uuid b/manifest.uuid
index eedb6d9e7d5b676e231ceb64c62b0e9256109e1c..9d5db4dfbb4177090127b8e4f97a3c160862998d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d94416ddca8f7ed727dd335d38155ea5945a86b7
\ No newline at end of file
+a8846aeed9992c6c9f1c8bd6e996a4cbe891751e
\ No newline at end of file

diff --git a/src/prepare.c b/src/prepare.c
index 3fb71a770e43669f0b25ff83a3a649c080b3ab9b..f74aa52e0b01c1628966ec217f10a80c49d44837 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -28,11 +28,10 @@ static void corruptSchema(
   if( !db->mallocFailed && (db->flags & SQLITE_RecoveryMode)==0 ){
     char *z;
     if( zObj==0 ) zObj = "?";
-    z = sqlite3_mprintf("malformed database schema (%s)", zObj);
-    if( z && zExtra ) z = sqlite3_mprintf("%z - %s", z, zExtra);
+    z = sqlite3MPrintf(db, "malformed database schema (%s)", zObj);
+    if( zExtra ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra);
     sqlite3DbFree(db, *pData->pzErrMsg);
     *pData->pzErrMsg = z;
-    if( z==0 ) sqlite3OomFault(db);
   }
   pData->rc = db->mallocFailed ? SQLITE_NOMEM : SQLITE_CORRUPT_BKPT;
 }