aboutsummaryrefslogtreecommitdiff
path: root/src/callback.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2014-09-15 15:34:31 +0000
committerdan <dan@noemail.net>2014-09-15 15:34:31 +0000
commitd4a80e6742921478b369a9537302bc586c79d812 (patch)
tree6731ece80e9d8851555cad39c555482f1db1a006 /src/callback.c
parentee8d0b4111b47bd91e9d3280e8540d3a560b0cc7 (diff)
parent907214c8e83a3d1f35b6cce5768016089193b3c2 (diff)
downloadsqlite-d4a80e6742921478b369a9537302bc586c79d812.tar.gz
sqlite-d4a80e6742921478b369a9537302bc586c79d812.zip
Merge latest trunk changes with this branch.
FossilOrigin-Name: 55b8011d5b455927f5b92a3cb911fd909fb0edab
Diffstat (limited to 'src/callback.c')
-rw-r--r--src/callback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/callback.c b/src/callback.c
index 63090899f..cd213b4b2 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -142,7 +142,7 @@ int sqlite3CheckCollSeq(Parse *pParse, CollSeq *pColl){
**
** Each pointer stored in the sqlite3.aCollSeq hash table contains an
** array of three CollSeq structures. The first is the collation sequence
-** prefferred for UTF-8, the second UTF-16le, and the third UTF-16be.
+** preferred for UTF-8, the second UTF-16le, and the third UTF-16be.
**
** Stored immediately after the three collation sequences is a copy of
** the collation sequence name. A pointer to this string is stored in