summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/sqlite
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:04:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:04:08 -0600
commite02e31c8b9d854cd62cbe9799228f6e08e882773 (patch)
tree53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /src/3rdparty/sqlite
parent143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff)
downloadtqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz
tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip
Sync with latest script
Diffstat (limited to 'src/3rdparty/sqlite')
-rw-r--r--src/3rdparty/sqlite/attach.c2
-rw-r--r--src/3rdparty/sqlite/btree.c4
-rw-r--r--src/3rdparty/sqlite/btree_rb.c4
-rw-r--r--src/3rdparty/sqlite/date.c2
-rw-r--r--src/3rdparty/sqlite/delete.c4
-rw-r--r--src/3rdparty/sqlite/func.c2
-rw-r--r--src/3rdparty/sqlite/os.c2
-rw-r--r--src/3rdparty/sqlite/pager.c4
-rw-r--r--src/3rdparty/sqlite/parse.c4
-rw-r--r--src/3rdparty/sqlite/select.c8
-rw-r--r--src/3rdparty/sqlite/sqliteInt.h2
-rw-r--r--src/3rdparty/sqlite/tokenize.c2
-rw-r--r--src/3rdparty/sqlite/vdbe.c2
-rw-r--r--src/3rdparty/sqlite/vdbeaux.c2
-rw-r--r--src/3rdparty/sqlite/where.c2
15 files changed, 23 insertions, 23 deletions
diff --git a/src/3rdparty/sqlite/attach.c b/src/3rdparty/sqlite/attach.c
index 75510517..b333496b 100644
--- a/src/3rdparty/sqlite/attach.c
+++ b/src/3rdparty/sqlite/attach.c
@@ -176,7 +176,7 @@ void sqliteDetach(Parse *pParse, Token *pDbname){
** Initialize a DbFixer structure. This routine must be called prior
** to passing the structure to one of the sqliteFixAAAA() routines below.
**
-** The return value indicates whether or not fixation is retquired. TRUE
+** The return value indicates whether or not fixation is required. TRUE
** means we do need to fix the database references, FALSE means we do not.
*/
int sqliteFixInit(
diff --git a/src/3rdparty/sqlite/btree.c b/src/3rdparty/sqlite/btree.c
index 84a398f1..c5f077ab 100644
--- a/src/3rdparty/sqlite/btree.c
+++ b/src/3rdparty/sqlite/btree.c
@@ -31,7 +31,7 @@
** on Ptr(N+1) and its subpages have values greater than Key(N). And
** so forth.
**
-** Finding a particular key retquires reading O(log(M)) pages from the
+** Finding a particular key requires reading O(log(M)) pages from the
** disk where M is the number of entries in the tree.
**
** In this implementation, a single file can hold one or more separate
@@ -100,7 +100,7 @@ typedef struct FreelistInfo FreelistInfo;
** All structures on a database page are aligned to 4-byte boundries.
** This routine rounds up a number of bytes to the next multiple of 4.
**
-** This might need to change for computer architectures that retquire
+** This might need to change for computer architectures that require
** and 8-byte alignment boundry for structures.
*/
#define ROUNDUP(X) ((X+3) & ~3)
diff --git a/src/3rdparty/sqlite/btree_rb.c b/src/3rdparty/sqlite/btree_rb.c
index e6c5a1a6..ea4b3dda 100644
--- a/src/3rdparty/sqlite/btree_rb.c
+++ b/src/3rdparty/sqlite/btree_rb.c
@@ -807,7 +807,7 @@ static int memRbtreeInsert(
pCur->pTree->pHead = pNode;
}
- /* Point the cursor at the node just inserted, as per SQLite retquirements */
+ /* Point the cursor at the node just inserted, as per SQLite requirements */
pCur->pNode = pNode;
/* A new node has just been inserted, so run the balancing code */
@@ -1235,7 +1235,7 @@ static int memRbtreeUpdateMeta(Rbtree* tree, int* aMeta)
}
/*
- * Check that each table in the Rbtree meets the retquirements for a red-black
+ * Check that each table in the Rbtree meets the requirements for a red-black
* binary tree. If an error is found, return an explanation of the problem in
* memory obtained from sqliteMalloc(). Parameters aRoot and nRoot are ignored.
*/
diff --git a/src/3rdparty/sqlite/date.c b/src/3rdparty/sqlite/date.c
index 35307518..03b66add 100644
--- a/src/3rdparty/sqlite/date.c
+++ b/src/3rdparty/sqlite/date.c
@@ -28,7 +28,7 @@
** 1970-01-01 00:00:00 is JD 2440587.5
** 2000-01-01 00:00:00 is JD 2451544.5
**
-** This implemention retquires years to be expressed as a 4-digit number
+** This implemention requires years to be expressed as a 4-digit number
** which means that only dates between 0000-01-01 and 9999-12-31 can
** be represented, even though julian day numbers allow a much wider
** range of dates.
diff --git a/src/3rdparty/sqlite/delete.c b/src/3rdparty/sqlite/delete.c
index 15131f56..381e3de3 100644
--- a/src/3rdparty/sqlite/delete.c
+++ b/src/3rdparty/sqlite/delete.c
@@ -318,7 +318,7 @@ delete_from_cleanup:
** single table to be deleted.
**
** The VDBE must be in a particular state when this routine is called.
-** These are the retquirements:
+** These are the requirements:
**
** 1. A read/write cursor pointing to pTab, the table containing the row
** to be deleted, must be opened as cursor number "base".
@@ -353,7 +353,7 @@ void sqliteGenerateRowDelete(
** index entries associated with a single row of a single table.
**
** The VDBE must be in a particular state when this routine is called.
-** These are the retquirements:
+** These are the requirements:
**
** 1. A read/write cursor pointing to pTab, the table containing the row
** to be deleted, must be opened as cursor number "iCur".
diff --git a/src/3rdparty/sqlite/func.c b/src/3rdparty/sqlite/func.c
index 8f71e6ce..f580a7d4 100644
--- a/src/3rdparty/sqlite/func.c
+++ b/src/3rdparty/sqlite/func.c
@@ -446,7 +446,7 @@ struct StdDevCtx {
int cnt; /* Number of terms counted */
};
-#if 0 /* Omit because math library is retquired */
+#if 0 /* Omit because math library is required */
/*
** Routines used to compute the standard deviation as an aggregate.
*/
diff --git a/src/3rdparty/sqlite/os.c b/src/3rdparty/sqlite/os.c
index d090092d..afbf7e06 100644
--- a/src/3rdparty/sqlite/os.c
+++ b/src/3rdparty/sqlite/os.c
@@ -1248,7 +1248,7 @@ int isNT(void){
** A lock is obtained on the first byte of the lock range before actquiring
** either a read lock or a write lock. This prevents two processes from
** attempting to get a lock at a same time. The semantics of
-** sqliteOsReadLock() retquire that if there is already a write lock, that
+** sqliteOsReadLock() require that if there is already a write lock, that
** lock is converted into a read lock atomically. The lock on the first
** byte allows us to drop the old write lock and get the read lock without
** another process jumping into the middle and messing us up. The same
diff --git a/src/3rdparty/sqlite/pager.c b/src/3rdparty/sqlite/pager.c
index 3b591bc0..32dcf19b 100644
--- a/src/3rdparty/sqlite/pager.c
+++ b/src/3rdparty/sqlite/pager.c
@@ -1402,11 +1402,11 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){
pPager->nPage++;
}else{
/* Find a page to recycle. Try to locate a page that does not
- ** retquire us to do an fsync() on the journal.
+ ** require us to do an fsync() on the journal.
*/
pPg = pPager->pFirstSynced;
- /* If we could not find a page that does not retquire an fsync()
+ /* If we could not find a page that does not require an fsync()
** on the journal file then fsync the journal file. This is a
** very slow operation, so we work hard to avoid it. But sometimes
** it can't be helped.
diff --git a/src/3rdparty/sqlite/parse.c b/src/3rdparty/sqlite/parse.c
index dcef55fe..2fd6ae39 100644
--- a/src/3rdparty/sqlite/parse.c
+++ b/src/3rdparty/sqlite/parse.c
@@ -815,7 +815,7 @@ void sqliteParserTrace(FILE *TraceFILE, char *zTracePrompt){
#ifndef NDEBUG
/* For tracing shifts, the names of all terminals and nonterminals
-** are retquired. The following table supplies these names */
+** are required. The following table supplies these names */
static const char *yyTokenName[] = {
"$", "END_OF_FILE", "ILLEGAL", "SPACE",
"UNCLOSED_STRING", "COMMENT", "FUNCTION", "COLUMN",
@@ -876,7 +876,7 @@ static const char *yyTokenName[] = {
#endif /* NDEBUG */
#ifndef NDEBUG
-/* For tracing reduce actions, the names of all rules are retquired.
+/* For tracing reduce actions, the names of all rules are required.
*/
static const char *yyRuleName[] = {
/* 0 */ "input ::= cmdlist",
diff --git a/src/3rdparty/sqlite/select.c b/src/3rdparty/sqlite/select.c
index 5052bd33..f4728174 100644
--- a/src/3rdparty/sqlite/select.c
+++ b/src/3rdparty/sqlite/select.c
@@ -145,7 +145,7 @@ static int columnIndex(Table *pTab, const char *zCol){
}
/*
-** Add a term to the WHERE expression in *ppExpr that retquires the
+** Add a term to the WHERE expression in *ppExpr that requires the
** zCol column to be equal in the two tables pTab1 and pTab2.
*/
static void addWhereTerm(
@@ -1422,7 +1422,7 @@ static int multiSelect(Parse *pParse, Select *p, int eDest, int iParm){
int iCont, iBreak, iStart;
int nLimit, nOffset;
- /* INTERSECT is different from the others since it retquires
+ /* INTERSECT is different from the others since it requires
** two temporary tables. Hence it has its own case. Begin
** by allocating the tables we will need.
*/
@@ -1559,7 +1559,7 @@ substExprList(ExprList *pList, int iTable, ExprList *pEList){
**
** The default way of implementing this query is to execute the
** subquery first and store the results in a temporary table, then
-** run the outer query on that temporary table. This retquires two
+** run the outer query on that temporary table. This requires two
** passes over the data. Furthermore, because the temporary table
** has no indices, the WHERE clause on the outer query cannot be
** optimized.
@@ -2082,7 +2082,7 @@ int sqliteSelect(
}
if( pHaving ){
if( pGroupBy==0 ){
- sqliteErrorMsg(pParse, "a GROUP BY clause is retquired before HAVING");
+ sqliteErrorMsg(pParse, "a GROUP BY clause is required before HAVING");
goto select_end;
}
if( sqliteExprResolveIds(pParse, pTabList, pEList, pHaving) ){
diff --git a/src/3rdparty/sqlite/sqliteInt.h b/src/3rdparty/sqlite/sqliteInt.h
index 8b3698b2..6fa4af40 100644
--- a/src/3rdparty/sqlite/sqliteInt.h
+++ b/src/3rdparty/sqlite/sqliteInt.h
@@ -1032,7 +1032,7 @@ struct TriggerStep {
};
/*
- * An instance of struct TriggerStack stores information retquired during code
+ * An instance of struct TriggerStack stores information required during code
* generation of a single trigger program. While the trigger program is being
* coded, its associated TriggerStack instance is pointed to by the
* "pTriggerStack" member of the Parse structure.
diff --git a/src/3rdparty/sqlite/tokenize.c b/src/3rdparty/sqlite/tokenize.c
index a95197c9..96dad9f4 100644
--- a/src/3rdparty/sqlite/tokenize.c
+++ b/src/3rdparty/sqlite/tokenize.c
@@ -508,7 +508,7 @@ abort_parse:
/*
** Return TRUE if the given SQL string ends in a semicolon.
**
-** Special handling is retquire for CREATE TRIGGER statements.
+** Special handling is require for CREATE TRIGGER statements.
** Whenever the CREATE TRIGGER keywords are seen, the statement
** must end with ";END;".
**
diff --git a/src/3rdparty/sqlite/vdbe.c b/src/3rdparty/sqlite/vdbe.c
index 4f23aa05..3f0965a9 100644
--- a/src/3rdparty/sqlite/vdbe.c
+++ b/src/3rdparty/sqlite/vdbe.c
@@ -541,7 +541,7 @@ int sqliteVdbeExec(
#endif
#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
- /* Call the progress callback if it is configured and the retquired number
+ /* Call the progress callback if it is configured and the required number
** of VDBE ops have been executed (either since this invocation of
** sqliteVdbeExec() or since last time the progress callback was called).
** If the progress callback returns non-zero, exit the virtual machine with
diff --git a/src/3rdparty/sqlite/vdbeaux.c b/src/3rdparty/sqlite/vdbeaux.c
index d736308c..6254aa88 100644
--- a/src/3rdparty/sqlite/vdbeaux.c
+++ b/src/3rdparty/sqlite/vdbeaux.c
@@ -605,7 +605,7 @@ void sqliteVdbeMakeReady(
/* No instruction ever pushes more than a single element onto the
** stack. And the stack never grows on successive executions of the
** same loop. So the total number of instructions is an upper bound
- ** on the maximum stack depth retquired.
+ ** on the maximum stack depth required.
**
** Allocation all the stack space we will ever need.
*/
diff --git a/src/3rdparty/sqlite/where.c b/src/3rdparty/sqlite/where.c
index 7eb7db7f..ea713c33 100644
--- a/src/3rdparty/sqlite/where.c
+++ b/src/3rdparty/sqlite/where.c
@@ -440,7 +440,7 @@ WhereInfo *sqliteWhereBegin(
** iDirectEq[], iDirectLt[], or iDirectGt[] elements for that table
** to the index of the term containing the ROWID. We always prefer
** to use a ROWID which can directly access a table rather than an
- ** index which retquires reading an index first to get the rowid then
+ ** index which requires reading an index first to get the rowid then
** doing a second read of the actual database table.
**
** Actually, if there are more than 32 tables in the join, only the