diff options
| author | dan <dan@noemail.net> | 2014-09-15 15:34:31 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2014-09-15 15:34:31 +0000 |
| commit | d4a80e6742921478b369a9537302bc586c79d812 (patch) | |
| tree | 6731ece80e9d8851555cad39c555482f1db1a006 /src/update.c | |
| parent | ee8d0b4111b47bd91e9d3280e8540d3a560b0cc7 (diff) | |
| parent | 907214c8e83a3d1f35b6cce5768016089193b3c2 (diff) | |
| download | sqlite-d4a80e6742921478b369a9537302bc586c79d812.tar.gz sqlite-d4a80e6742921478b369a9537302bc586c79d812.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 55b8011d5b455927f5b92a3cb911fd909fb0edab
Diffstat (limited to 'src/update.c')
| -rw-r--r-- | src/update.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/update.c b/src/update.c index e152e9057..f781a60cc 100644 --- a/src/update.c +++ b/src/update.c @@ -327,7 +327,7 @@ void sqlite3Update( } /* If we are trying to update a view, realize that view into - ** a ephemeral table. + ** an ephemeral table. */ #if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER) if( isView ){ @@ -488,7 +488,7 @@ void sqlite3Update( } /* Populate the array of registers beginning at regNew with the new - ** row data. This array is used to check constaints, create the new + ** row data. This array is used to check constants, create the new ** table and index records, and as the values for any new.* references ** made by triggers. ** @@ -668,7 +668,7 @@ update_cleanup: return; } /* Make sure "isView" and other macros defined above are undefined. Otherwise -** thely may interfere with compilation of other functions in this file +** they may interfere with compilation of other functions in this file ** (or in another file, if this file becomes part of the amalgamation). */ #ifdef isView #undef isView @@ -681,7 +681,7 @@ update_cleanup: /* ** Generate code for an UPDATE of a virtual table. ** -** The strategy is that we create an ephemerial table that contains +** The strategy is that we create an ephemeral table that contains ** for each row to be changed: ** ** (A) The original rowid of that row. @@ -689,7 +689,7 @@ update_cleanup: ** (C) The content of every column in the row. ** ** Then we loop over this ephemeral table and for each row in -** the ephermeral table call VUpdate. +** the ephemeral table call VUpdate. ** ** When finished, drop the ephemeral table. ** |