mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: typo fixes (argument) typo fixes (accommodate, parameter)
This commit is contained in:
commit
84e35fb2e0
62 changed files with 69 additions and 69 deletions
|
@ -93544,7 +93544,7 @@ static u8 minMaxQuery(Select *p){
|
|||
|
||||
/*
|
||||
** The select statement passed as the first argument is an aggregate query.
|
||||
** The second argment is the associated aggregate-info object. This
|
||||
** The second argument is the associated aggregate-info object. This
|
||||
** function tests if the SELECT is of the form:
|
||||
**
|
||||
** SELECT count(*) FROM <tbl>
|
||||
|
@ -93617,7 +93617,7 @@ SQLITE_PRIVATE int sqlite3IndexedByLookup(Parse *pParse, struct SrcList_item *pF
|
|||
** without worrying about messing up the presistent representation
|
||||
** of the view.
|
||||
**
|
||||
** (3) Add terms to the WHERE clause to accomodate the NATURAL keyword
|
||||
** (3) Add terms to the WHERE clause to accommodate the NATURAL keyword
|
||||
** on joins and the ON and USING clause of joins.
|
||||
**
|
||||
** (4) Scan the list of columns in the result set (pEList) looking
|
||||
|
@ -96115,7 +96115,7 @@ SQLITE_PRIVATE void sqlite3CodeRowTriggerDirect(
|
|||
/*
|
||||
** This is called to code the required FOR EACH ROW triggers for an operation
|
||||
** on table pTab. The operation to code triggers for (INSERT, UPDATE or DELETE)
|
||||
** is given by the op paramater. The tr_tm parameter determines whether the
|
||||
** is given by the op parameter. The tr_tm parameter determines whether the
|
||||
** BEFORE or AFTER triggers are coded. If the operation is an UPDATE, then
|
||||
** parameter pChanges is passed the list of columns being modified.
|
||||
**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue