Removed 3rd (file) column from PRAGMA database_list until tests are fixed. (CVS 974)

FossilOrigin-Name: 4183cf97676e64d19978941a7c4a3fe521fcb1fb
This commit is contained in:
jplyon 2003-05-13 08:01:33 +00:00
parent 39581966a0
commit 931634915d
3 changed files with 10 additions and 13 deletions

View File

@ -1,5 +1,5 @@
C Fix\sanother\stwos-complement\snegation\serror.\s\sTicket\s#313.\s(CVS\s973)
D 2003-05-13T01:52:32
C Removed\s3rd\s(file)\scolumn\sfrom\sPRAGMA\sdatabase_list\suntil\stests\sare\sfixed.\s(CVS\s974)
D 2003-05-13T08:01:34
F Makefile.in 004acec253ecdde985c8ecd5b7c9accdb210378f
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@ -40,7 +40,7 @@ F src/os.h 9e5bbddff123187295e3d00d49af06192cd1cd49
F src/pager.c 51fdfda63e2d8c01fff8f7fe0c49f2636d5b1321
F src/pager.h 5da62c83443f26b1792cfd72c96c422f91aadd31
F src/parse.y 39b5240cb78047dc56d6d37c398baed7ba556779
F src/pragma.c 8928b747a48d2c84de79814a71792ea13367644b
F src/pragma.c ec64704e61286948f39157617f1ce2f506dd1b74
F src/printf.c fc5fdef6e92ad205005263661fe9716f55a49f3e
F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
F src/select.c c06b4605bca03d8237a3fc4098179bf3a7133702
@ -165,7 +165,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
F www/sqlite.tcl 4bd1729e320f5fa9125f0022b281fbe839192125
F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
P b59d9033d5556015543ac5ca23110ccbeb4391f0
R 60377002c634c844f060bed55b91931b
U drh
Z 23f7cdbac7922b0f8c36b68abd2c81c6
P f267a8a4ff52eb7ee3ac20a8e3a8ab5fe19e445d
R 4c116ad646a5d45f20337623549b2e99
U jplyon
Z d2079033f7e558e2136afb4a88150abf

View File

@ -1 +1 @@
f267a8a4ff52eb7ee3ac20a8e3a8ab5fe19e445d
4183cf97676e64d19978941a7c4a3fe521fcb1fb

View File

@ -11,7 +11,7 @@
*************************************************************************
** This file contains code used to implement the PRAGMA command.
**
** $Id: pragma.c,v 1.7 2003/05/11 20:09:20 jplyon Exp $
** $Id: pragma.c,v 1.8 2003/05/13 08:01:34 jplyon Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@ -421,7 +421,6 @@ void sqlitePragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){
static VdbeOp indexListPreface[] = {
{ OP_ColumnName, 0, 0, "seq"},
{ OP_ColumnName, 1, 0, "name"},
{ OP_ColumnName, 2, 0, "file"},
};
sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface);
@ -431,9 +430,7 @@ void sqlitePragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){
sqliteVdbeAddOp(v, OP_Integer, i, 0);
sqliteVdbeAddOp(v, OP_String, 0, 0);
sqliteVdbeChangeP3(v, -1, db->aDb[i].zName, P3_STATIC);
sqliteVdbeAddOp(v, OP_String, 0, 0);
sqliteVdbeChangeP3(v, -1, btOps(db->aDb[i].pBt)->GetFilename(db->aDb[i].pBt), P3_STATIC);
sqliteVdbeAddOp(v, OP_Callback, 3, 0);
sqliteVdbeAddOp(v, OP_Callback, 2, 0);
}
}else
/*