Remove the second definition of SQLITE_N_BTREE_META from test3.c. (CVS 1609)
FossilOrigin-Name: b1e66ae4640c2cd32d47c043b5c25ea67182098b
This commit is contained in:
parent
f7df9ccfe7
commit
d09b592f63
14
manifest
14
manifest
@ -1,5 +1,5 @@
|
|||||||
C Trivial\smodifications\sto\sprevent\scompiler\swarnings.\s(CVS\s1608)
|
C Remove\sthe\ssecond\sdefinition\sof\sSQLITE_N_BTREE_META\sfrom\stest3.c.\s(CVS\s1609)
|
||||||
D 2004-06-16T12:02:47
|
D 2004-06-17T00:01:21
|
||||||
F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
|
F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
|
||||||
F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
|
F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
|
||||||
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
|
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
|
||||||
@ -62,7 +62,7 @@ F src/table.c af14284fa36c8d41f6829e3f2819dce07d3e2de2
|
|||||||
F src/tclsqlite.c 6f88be282a3617c6739c043fd13571b5f2fe9922
|
F src/tclsqlite.c 6f88be282a3617c6739c043fd13571b5f2fe9922
|
||||||
F src/test1.c 49c69d360ce09f8ecf56ec5e55fba625703d8b21
|
F src/test1.c 49c69d360ce09f8ecf56ec5e55fba625703d8b21
|
||||||
F src/test2.c db0a0c30b59f1639cb8c2572be06439402833cc8
|
F src/test2.c db0a0c30b59f1639cb8c2572be06439402833cc8
|
||||||
F src/test3.c beafd0ccf7b9ae784744be1b1e66ffe8f64c25da
|
F src/test3.c 7247090d15a5a43823079b6fd8dad1ed3cccdedf
|
||||||
F src/test4.c a921a69821fd30209589228e64f94e9f715b6fe2
|
F src/test4.c a921a69821fd30209589228e64f94e9f715b6fe2
|
||||||
F src/test5.c 13ac1db35b03acbc197ceb245fe862da5ebf2369
|
F src/test5.c 13ac1db35b03acbc197ceb245fe862da5ebf2369
|
||||||
F src/tokenize.c 183c5d7da11affab5d70d903d33409c8c0ce6c5b
|
F src/tokenize.c 183c5d7da11affab5d70d903d33409c8c0ce6c5b
|
||||||
@ -87,7 +87,7 @@ F test/bigfile.test 5b079dfe7354a6c43b92a3ea5e49e4e5d88c789e
|
|||||||
F test/bigrow.test 8ab252dba108f12ad64e337b0f2ff31a807ac578
|
F test/bigrow.test 8ab252dba108f12ad64e337b0f2ff31a807ac578
|
||||||
F test/bind.test 4f5a19e84077b61ea797644b4942bb98b17bdd42
|
F test/bind.test 4f5a19e84077b61ea797644b4942bb98b17bdd42
|
||||||
F test/blob.test b6474275536614352d6e1c729f23a18ba1082ae9
|
F test/blob.test b6474275536614352d6e1c729f23a18ba1082ae9
|
||||||
F test/btree.test 018909b1c7ffe1fdcbd07774250a52ea58de3a11
|
F test/btree.test 77209dd37bb12ae501a0588b4c69bd7079ebdf1a
|
||||||
F test/btree2.test aa4a6d05b1ea90b1acaf83ba89039dd302a88635
|
F test/btree2.test aa4a6d05b1ea90b1acaf83ba89039dd302a88635
|
||||||
F test/btree4.test 3797b4305694c7af6828675b0f4b1424b8ca30e4
|
F test/btree4.test 3797b4305694c7af6828675b0f4b1424b8ca30e4
|
||||||
F test/btree5.test 8e5ff32c02e685d36516c6499add9375fe1377f2
|
F test/btree5.test 8e5ff32c02e685d36516c6499add9375fe1377f2
|
||||||
@ -224,7 +224,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248
|
|||||||
F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
|
F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
|
||||||
F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
|
F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
|
||||||
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
|
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
|
||||||
P 7974c9a6f5ed86f02176376d99d909c43a4ae455
|
P b3d5ad6f7832d46e34e99e4a1cb7e47c88f207a4
|
||||||
R 85df656fc4f4b3a44d71d211647234ae
|
R d93bea5ab3d12a073c52b74c322a8b4e
|
||||||
U danielk1977
|
U danielk1977
|
||||||
Z fb4d7815b96c96ab66b53516ec35fdb2
|
Z 8afc068f768f5a3187c752516f58beb6
|
||||||
|
@ -1 +1 @@
|
|||||||
b3d5ad6f7832d46e34e99e4a1cb7e47c88f207a4
|
b1e66ae4640c2cd32d47c043b5c25ea67182098b
|
@ -13,7 +13,7 @@
|
|||||||
** is not included in the SQLite library. It is used for automated
|
** is not included in the SQLite library. It is used for automated
|
||||||
** testing of the SQLite library.
|
** testing of the SQLite library.
|
||||||
**
|
**
|
||||||
** $Id: test3.c,v 1.43 2004/06/04 06:22:02 danielk1977 Exp $
|
** $Id: test3.c,v 1.44 2004/06/17 00:01:21 danielk1977 Exp $
|
||||||
*/
|
*/
|
||||||
#include "sqliteInt.h"
|
#include "sqliteInt.h"
|
||||||
#include "pager.h"
|
#include "pager.h"
|
||||||
@ -361,8 +361,6 @@ static int btree_clear_table(
|
|||||||
return TCL_OK;
|
return TCL_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define SQLITE_N_BTREE_META 16
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Usage: btree_get_meta ID
|
** Usage: btree_get_meta ID
|
||||||
**
|
**
|
||||||
@ -413,7 +411,7 @@ static int btree_update_meta(
|
|||||||
int i;
|
int i;
|
||||||
int aMeta[SQLITE_N_BTREE_META];
|
int aMeta[SQLITE_N_BTREE_META];
|
||||||
|
|
||||||
if( argc!=1+SQLITE_N_BTREE_META ){
|
if( argc!=2+SQLITE_N_BTREE_META ){
|
||||||
char zBuf[30];
|
char zBuf[30];
|
||||||
sprintf(zBuf,"%d",SQLITE_N_BTREE_META);
|
sprintf(zBuf,"%d",SQLITE_N_BTREE_META);
|
||||||
Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
|
Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
# This file implements regression tests for SQLite library. The
|
# This file implements regression tests for SQLite library. The
|
||||||
# focus of this script is btree database backend
|
# focus of this script is btree database backend
|
||||||
#
|
#
|
||||||
# $Id: btree.test,v 1.26 2004/05/30 21:14:59 drh Exp $
|
# $Id: btree.test,v 1.27 2004/06/17 00:01:21 danielk1977 Exp $
|
||||||
|
|
||||||
|
|
||||||
set testdir [file dirname $argv0]
|
set testdir [file dirname $argv0]
|
||||||
@ -369,35 +369,34 @@ do_test btree-4.9 {
|
|||||||
#
|
#
|
||||||
do_test btree-5.1 {
|
do_test btree-5.1 {
|
||||||
btree_get_meta $::b1
|
btree_get_meta $::b1
|
||||||
} {0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0}
|
} {0 0 0 0 0 0 0 0 0 0}
|
||||||
do_test btree-5.2 {
|
do_test btree-5.2 {
|
||||||
set rc [catch {
|
set rc [catch {
|
||||||
btree_update_meta $::b1 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
|
btree_update_meta $::b1 1 2 3 4 5 6 7 8 9 10
|
||||||
} msg]
|
} msg]
|
||||||
lappend rc $msg
|
lappend rc $msg
|
||||||
} {1 SQLITE_ERROR}
|
} {1 SQLITE_ERROR}
|
||||||
do_test btree-5.3 {
|
do_test btree-5.3 {
|
||||||
btree_begin_transaction $::b1
|
btree_begin_transaction $::b1
|
||||||
set rc [catch {
|
set rc [catch {
|
||||||
btree_update_meta $::b1 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
|
btree_update_meta $::b1 1 2 3 4 5 6 7 8 9 10
|
||||||
} msg]
|
} msg]
|
||||||
lappend rc $msg
|
lappend rc $msg
|
||||||
} {0 {}}
|
} {0 {}}
|
||||||
do_test btree-5.4 {
|
do_test btree-5.4 {
|
||||||
btree_get_meta $::b1
|
btree_get_meta $::b1
|
||||||
} {0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15}
|
} {0 1 2 3 4 5 6 7 8 9}
|
||||||
do_test btree-5.5 {
|
do_test btree-5.5 {
|
||||||
btree_close_cursor $::c1
|
btree_close_cursor $::c1
|
||||||
btree_rollback $::b1
|
btree_rollback $::b1
|
||||||
btree_get_meta $::b1
|
btree_get_meta $::b1
|
||||||
} {0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0}
|
} {0 0 0 0 0 0 0 0 0 0}
|
||||||
do_test btree-5.6 {
|
do_test btree-5.6 {
|
||||||
btree_begin_transaction $::b1
|
btree_begin_transaction $::b1
|
||||||
btree_update_meta $::b1 10 20 30 40 50 60 70 80 90 100 110 120 130 \
|
btree_update_meta $::b1 10 20 30 40 50 60 70 80 90 100
|
||||||
140 150
|
|
||||||
btree_commit $::b1
|
btree_commit $::b1
|
||||||
btree_get_meta $::b1
|
btree_get_meta $::b1
|
||||||
} {0 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150}
|
} {0 10 20 30 40 50 60 70 80 90}
|
||||||
|
|
||||||
proc select_all {cursor} {
|
proc select_all {cursor} {
|
||||||
set r {}
|
set r {}
|
||||||
|
Loading…
Reference in New Issue
Block a user