Fix a bug in the error reporting of sqlite3_table_column_metadata(). (CVS 5422)

FossilOrigin-Name: 7eba18c3a5c91be2ca2b6cf9e4e04a2791e1f7b2

diff --git a/manifest b/manifest
index 31c9f0ad046faf6974c3c6d977dc6a2090a6decf..3a37ef8dfb3524a789dbd3c012717086edb56715 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\s"experimental"\smarkings\son\sC/C++\sinterfaces.\s(CVS\s5421)
-D 2008-07-16T13:29:51
+C Fix\sa\sbug\sin\sthe\serror\sreporting\sof\ssqlite3_table_column_metadata().\s(CVS\s5422)
+D 2008-07-16T14:02:33
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a03f7cb4f7ad50bc53a788c6c544430e81f95de4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -115,7 +115,7 @@ F src/insert.c e8efc17d037346e4a4a6949e72aab850befe3d5d
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c 3626c71fb70912abec9a4312beba753a9ce800df
 F src/loadext.c ae0eed9fa96d74172d2a90ee63b5bc36d284295c
-F src/main.c 1c0d8528a2fe8c376f4c52de9fcd53f747e4528b
+F src/main.c 59b622b0f6b6c4b44a23a71ae8dac53bfec113ca
 F src/malloc.c b9ff4e02fee17d2158cc52ac44a02a56bde3cf62
 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
 F src/mem1.c 8340fa5f969e9f9b9bdeb54106457a2003456d2b
@@ -608,7 +608,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 9af2514c83782b4745bf48a4f82ff83111fa5535
-R 9eb9129e182956818742831e4ba083f6
+P 96e95aa5e6c237bb9330900c2e1ac446158eca46
+R a3428b4a9a082bda0809452f0fe743db
 U drh
-Z 42cb41bbcbebc740b4719292829808aa
+Z b7c6fbe15a46c85549ae8c362cfda56c

diff --git a/manifest.uuid b/manifest.uuid
index 1cbcf373073f98806235ccafef2a2d478e133412..53c3379f091541f0f82d852584d4342a4bd91d27 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-96e95aa5e6c237bb9330900c2e1ac446158eca46
\ No newline at end of file
+7eba18c3a5c91be2ca2b6cf9e4e04a2791e1f7b2
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 3d4cd5360a0bda311dc618897ff44841614a3062..fd2939816e55d29183aadb1f868f3303f27d068c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.478 2008/07/16 12:25:32 drh Exp $
+** $Id: main.c,v 1.479 2008/07/16 14:02:33 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1748,7 +1748,7 @@ error_out:
 
   if( SQLITE_OK==rc && !pTab ){
     sqlite3_free(zErrMsg);
-    zErrMsg = sqlite3MPrintf("no such table column: %s.%s", zTableName,
+    zErrMsg = sqlite3MPrintf(db, "no such table column: %s.%s", zTableName,
         zColumnName);
     rc = SQLITE_ERROR;
   }