1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00

Fix ticket #1046 by removing code and simplifying the query optimizer.

Remarkably, this simplification also makes the optimizer do a better job.
Ticket #1051 was fixed as a side-effect. (CVS 2172)

FossilOrigin-Name: 5fd1f4711885e3dd6fb2c2700287f78bb0ea178a
This commit is contained in:
drh
2004-12-25 01:03:13 +00:00
parent 9a09a3caed
commit e6f85e71e9
10 changed files with 58 additions and 78 deletions

View File

@@ -11,7 +11,7 @@
*************************************************************************
** This file contains code used to implement the PRAGMA command.
**
** $Id: pragma.c,v 1.80 2004/12/20 19:01:33 tpoindex Exp $
** $Id: pragma.c,v 1.81 2004/12/25 01:03:14 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -389,14 +389,14 @@ void sqlite3Pragma(
if( sqlite3_temp_directory ){
if( strlen(sqlite3_temp_directory) < strlen(zRight) + 1){
sqlite3FreeX(sqlite3_temp_directory);
sqlite3_temp_directory = sqlite3Malloc( strlen(zRight) + 1 );
sqlite3_temp_directory = sqliteMalloc( strlen(zRight) + 1 );
if( sqlite3_temp_directory==0 ){
goto pragma_out;
}
sqlite3_temp_directory[0] = '\0';
}
}else{
sqlite3_temp_directory = sqlite3Malloc( strlen(zRight) + 1 );
sqlite3_temp_directory = sqliteMalloc( strlen(zRight) + 1 );
if( sqlite3_temp_directory==0 ){
goto pragma_out;
}