When reporting back the datatype of columns, use the text of the datatype

as it appears in the CREATE TABLE statement, if available.  Also: removed
the ".reindex" command from the shell. (CVS 669)

FossilOrigin-Name: ff8b6f4ee8099a7170cb786b8ead9a3e42ab5869

1 files changed, 4 insertions, 6 deletions

diff --git a/src/threadtest.c b/src/threadtest.c
index 7255ba919..b85f7d6ab 100644
--- a/src/threadtest.c
+++ b/src/threadtest.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#define sqliteFree(X)  sqliteFree_(X,__FILE__,__LINE__)
-
 /*
 ** Come here to die.
 */
@@ -100,7 +98,7 @@ char **db_query(sqlite *db, const char *zFile, const char *zFormat, ...){
     free(zSql);
     Exit(1);
   }
-  sqliteFree(zSql);
+  sqlite_freemem(zSql);
   if( sResult.azElem==0 ){
     db_query_callback(&sResult, 0, 0, 0);
   }
@@ -123,10 +121,10 @@ void db_execute(sqlite *db, const char *zFile, const char *zFormat, ...){
   if( zErrMsg ){
     fprintf(stderr,"%s: command failed: %s - %s\n", zFile, zSql, zErrMsg);
     free(zErrMsg);
-    sqliteFree(zSql);
+    sqlite_freemem(zSql);
     Exit(1);
   }
-  sqliteFree(zSql);
+  sqlite_freemem(zSql);
 }
 
 /*
@@ -135,7 +133,7 @@ void db_execute(sqlite *db, const char *zFile, const char *zFormat, ...){
 void db_query_free(char **az){
   int i;
   for(i=0; az[i]; i++){
-    sqliteFree(az[i]);
+    sqlite_freemem(az[i]);
   }
   free(az);
 }