Turn the short_column_names pragma off by default - for the time being. (CVS 1254)

FossilOrigin-Name: 6954d2c3240459842be655b600c6b160e918e74a

diff --git a/manifest b/manifest
index e99daee29df25edfaae32b561a8cc80469e10a00..8bc8d2a284e9b4627009b5acc37d1ef050300cd9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssqlite.def\sfile\srequired\sfor\scorrect\soperation\sof\s"make\simplib"\soption\sin\sMakefile.in\s(CVS\s1253)
-D 2004-02-20T22:55:41
+C Turn\sthe\sshort_column_names\spragma\soff\sby\sdefault\s-\sfor\sthe\stime\sbeing.\s(CVS\s1254)
+D 2004-02-20T23:34:07
 F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -37,7 +37,7 @@ F src/func.c 36504a3458a5501ce960c46c74ead32aab9b306a
 F src/hash.c 9b56ef3b291e25168f630d5643a4264ec011c70e
 F src/hash.h 3247573ab95b9dd90bcca0307a75d9a16da1ccc7
 F src/insert.c ad2902c171d23b92e2b350db2da86e36062e044b
-F src/main.c ab7f1aae3fff4adbf3b5d518267a1160d7760a6b
+F src/main.c 0f77633b37540fabd45e68c5137f32f4cd99470a
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
 F src/os.c f5fc4954725b2fcd852979f2746085fe8ca27710
 F src/os.h 250a3789be609adfee5c5aa20137ce8683276f24
@@ -189,7 +189,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 6734c923395ca41ce453f56dd7d6e7794fbb3bb5
-R f8705eac42a6434b032b3659ecbbf698
-U rdc
-Z db37aa612f1e95756754802050da3226
+P b1b23c410260293f57614f32232cf1276f41c16b
+R a77bad2f0fdb5f58fdc86ec241aff60d
+U drh
+Z 99f24ada72efe423c099a6c6ffecaab2

diff --git a/manifest.uuid b/manifest.uuid
index 8d76cb0c7da10335dbb23329c9f33502f890351c..459232ab02f5449f23bc5d856aac6886fb6a57a5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b1b23c410260293f57614f32232cf1276f41c16b
\ No newline at end of file
+6954d2c3240459842be655b600c6b160e918e74a
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 3c8b2d680c2c8d9b02993c9576728fb7d72353db..bd62f07530a7f4d4f15f45270251dfbd85c6ed23 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.158 2004/02/20 22:53:39 rdc Exp $
+** $Id: main.c,v 1.159 2004/02/20 23:34:07 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -478,7 +478,7 @@ sqlite *sqlite_open(const char *zFilename, int mode, char **pzErrMsg){
   db->magic = SQLITE_MAGIC_BUSY;
   db->nDb = 2;
   db->aDb = db->aDbStatic;
-  db->flags |= SQLITE_ShortColNames;
+  /* db->flags |= SQLITE_ShortColNames; */
   sqliteHashInit(&db->aFunc, SQLITE_HASH_STRING, 1);
   for(i=0; i<db->nDb; i++){
     sqliteHashInit(&db->aDb[i].tblHash, SQLITE_HASH_STRING, 0);