Fossil SCM
Cherry-pick Solaris build fix from SQLite trunk [http://www.sqlite.org/src/info/c8000e94cca59dab]
Commit
54cf4397f499fa5100fbd165a2c37ae51215d3b2c47875982e417c7b601237e5
Parent
84c2682f4f47038…
1 file changed
+2
-2
+2
-2
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -139380,11 +139380,11 @@ | ||
| 139380 | 139380 | int tokenType; /* type of the next token */ |
| 139381 | 139381 | int lastTokenParsed = -1; /* type of the previous token */ |
| 139382 | 139382 | sqlite3 *db = pParse->db; /* The database connection */ |
| 139383 | 139383 | int mxSqlLen; /* Max length of an SQL string */ |
| 139384 | 139384 | #ifdef sqlite3Parser_ENGINEALWAYSONSTACK |
| 139385 | - unsigned char zSpace[sizeof(yyParser)]; /* Space for parser engine object */ | |
| 139385 | + yyParser sEngine; /* Space to hold the Lemon-generated Parser object */ | |
| 139386 | 139386 | #endif |
| 139387 | 139387 | |
| 139388 | 139388 | assert( zSql!=0 ); |
| 139389 | 139389 | mxSqlLen = db->aLimit[SQLITE_LIMIT_SQL_LENGTH]; |
| 139390 | 139390 | if( db->nVdbeActive==0 ){ |
| @@ -139393,11 +139393,11 @@ | ||
| 139393 | 139393 | pParse->rc = SQLITE_OK; |
| 139394 | 139394 | pParse->zTail = zSql; |
| 139395 | 139395 | assert( pzErrMsg!=0 ); |
| 139396 | 139396 | /* sqlite3ParserTrace(stdout, "parser: "); */ |
| 139397 | 139397 | #ifdef sqlite3Parser_ENGINEALWAYSONSTACK |
| 139398 | - pEngine = zSpace; | |
| 139398 | + pEngine = &sEngine; | |
| 139399 | 139399 | sqlite3ParserInit(pEngine); |
| 139400 | 139400 | #else |
| 139401 | 139401 | pEngine = sqlite3ParserAlloc(sqlite3Malloc); |
| 139402 | 139402 | if( pEngine==0 ){ |
| 139403 | 139403 | sqlite3OomFault(db); |
| 139404 | 139404 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -139380,11 +139380,11 @@ | |
| 139380 | int tokenType; /* type of the next token */ |
| 139381 | int lastTokenParsed = -1; /* type of the previous token */ |
| 139382 | sqlite3 *db = pParse->db; /* The database connection */ |
| 139383 | int mxSqlLen; /* Max length of an SQL string */ |
| 139384 | #ifdef sqlite3Parser_ENGINEALWAYSONSTACK |
| 139385 | unsigned char zSpace[sizeof(yyParser)]; /* Space for parser engine object */ |
| 139386 | #endif |
| 139387 | |
| 139388 | assert( zSql!=0 ); |
| 139389 | mxSqlLen = db->aLimit[SQLITE_LIMIT_SQL_LENGTH]; |
| 139390 | if( db->nVdbeActive==0 ){ |
| @@ -139393,11 +139393,11 @@ | |
| 139393 | pParse->rc = SQLITE_OK; |
| 139394 | pParse->zTail = zSql; |
| 139395 | assert( pzErrMsg!=0 ); |
| 139396 | /* sqlite3ParserTrace(stdout, "parser: "); */ |
| 139397 | #ifdef sqlite3Parser_ENGINEALWAYSONSTACK |
| 139398 | pEngine = zSpace; |
| 139399 | sqlite3ParserInit(pEngine); |
| 139400 | #else |
| 139401 | pEngine = sqlite3ParserAlloc(sqlite3Malloc); |
| 139402 | if( pEngine==0 ){ |
| 139403 | sqlite3OomFault(db); |
| 139404 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -139380,11 +139380,11 @@ | |
| 139380 | int tokenType; /* type of the next token */ |
| 139381 | int lastTokenParsed = -1; /* type of the previous token */ |
| 139382 | sqlite3 *db = pParse->db; /* The database connection */ |
| 139383 | int mxSqlLen; /* Max length of an SQL string */ |
| 139384 | #ifdef sqlite3Parser_ENGINEALWAYSONSTACK |
| 139385 | yyParser sEngine; /* Space to hold the Lemon-generated Parser object */ |
| 139386 | #endif |
| 139387 | |
| 139388 | assert( zSql!=0 ); |
| 139389 | mxSqlLen = db->aLimit[SQLITE_LIMIT_SQL_LENGTH]; |
| 139390 | if( db->nVdbeActive==0 ){ |
| @@ -139393,11 +139393,11 @@ | |
| 139393 | pParse->rc = SQLITE_OK; |
| 139394 | pParse->zTail = zSql; |
| 139395 | assert( pzErrMsg!=0 ); |
| 139396 | /* sqlite3ParserTrace(stdout, "parser: "); */ |
| 139397 | #ifdef sqlite3Parser_ENGINEALWAYSONSTACK |
| 139398 | pEngine = &sEngine; |
| 139399 | sqlite3ParserInit(pEngine); |
| 139400 | #else |
| 139401 | pEngine = sqlite3ParserAlloc(sqlite3Malloc); |
| 139402 | if( pEngine==0 ){ |
| 139403 | sqlite3OomFault(db); |
| 139404 |