Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix a problem preventing compilation with SQLITE_OMIT_UTF16. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
906d1fd8650874236e0bf5734d5347dc |
| User & Date: | dan 2019-03-04 07:15:57 |
Context
|
2019-03-05
| ||
| 14:39 | If the initial byte of a record is a large value, then always used the generalized record comparison routine sqlite3VdbeRecordCompare() rather than one of the specialized versions that are optimized for shorter records. (check-in: c1ac00706b user: drh tags: trunk) | |
|
2019-03-04
| ||
| 21:08 | Merge trunk changes into this branch. (check-in: 9b4d561f68 user: dan tags: window-functions) | |
| 07:25 | Merge latest trunk changes into this branch. (check-in: 97a9604d85 user: dan tags: reuse-schema) | |
| 07:15 | Fix a problem preventing compilation with SQLITE_OMIT_UTF16. (check-in: 906d1fd865 user: dan tags: trunk) | |
|
2019-03-02
| ||
| 20:09 | Improved comments on the fossildelta.c extension. (check-in: d7d23f0450 user: drh tags: trunk) | |
Changes
Changes to src/vdbeapi.c.
1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 |
db = p->db;
assert( db!=0 );
n = sqlite3_column_count(pStmt);
if( N<n && N>=0 ){
N += useType*n;
sqlite3_mutex_enter(db->mutex);
assert( db->mallocFailed==0 );
if( useUtf16 ){
ret = sqlite3_value_text16((sqlite3_value*)&p->aColName[N]);
}else{
ret = sqlite3_value_text((sqlite3_value*)&p->aColName[N]);
}
/* A malloc may have failed inside of the _text() call. If this
** is the case, clear the mallocFailed flag and return NULL.
*/
if( db->mallocFailed ){
sqlite3OomClear(db);
|
> | > > |
1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 |
db = p->db;
assert( db!=0 );
n = sqlite3_column_count(pStmt);
if( N<n && N>=0 ){
N += useType*n;
sqlite3_mutex_enter(db->mutex);
assert( db->mallocFailed==0 );
#ifndef SQLITE_OMIT_UTF16
if( useUtf16 ){
ret = sqlite3_value_text16((sqlite3_value*)&p->aColName[N]);
}else
#endif
{
ret = sqlite3_value_text((sqlite3_value*)&p->aColName[N]);
}
/* A malloc may have failed inside of the _text() call. If this
** is the case, clear the mallocFailed flag and return NULL.
*/
if( db->mallocFailed ){
sqlite3OomClear(db);
|