diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main.c | 2 | ||||
-rw-r--r-- | src/shell.c.in | 4 | ||||
-rw-r--r-- | src/sqlite.h.in | 10 | ||||
-rw-r--r-- | src/sqliteInt.h | 4 | ||||
-rw-r--r-- | src/test1.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/main.c b/src/main.c index a0e5e6585..e79d67613 100644 --- a/src/main.c +++ b/src/main.c @@ -970,7 +970,7 @@ int sqlite3_db_config(sqlite3 *db, int op, ...){ { SQLITE_DBCONFIG_DQS_DML, SQLITE_DqsDML }, { SQLITE_DBCONFIG_LEGACY_FILE_FORMAT, SQLITE_LegacyFileFmt }, { SQLITE_DBCONFIG_TRUSTED_SCHEMA, SQLITE_TrustedSchema }, - { SQLITE_DBCONFIG_STMT_SCANSTATS, SQLITE_StmtScanStats }, + { SQLITE_DBCONFIG_STMT_SCANSTATUS, SQLITE_StmtScanStatus }, }; unsigned int i; rc = SQLITE_ERROR; /* IMP: R-42790-23372 */ diff --git a/src/shell.c.in b/src/shell.c.in index a983ec0c0..0a54a3c5a 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -5421,7 +5421,7 @@ static void open_db(ShellState *p, int openFlags){ sqlite3_set_authorizer(p->db, safeModeAuth, p); } sqlite3_db_config( - p->db, SQLITE_DBCONFIG_STMT_SCANSTATS, p->scanstatsOn, (int*)0 + p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, p->scanstatsOn, (int*)0 ); } } @@ -9775,7 +9775,7 @@ static int do_meta_command(char *zLine, ShellState *p){ p->scanstatsOn = (u8)booleanValue(azArg[1]); } sqlite3_db_config( - p->db, SQLITE_DBCONFIG_STMT_SCANSTATS, p->scanstatsOn, (int*)0 + p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, p->scanstatsOn, (int*)0 ); #ifndef SQLITE_ENABLE_STMT_SCANSTATUS raw_printf(stderr, "Warning: .scanstats not available in this build.\n"); diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 0a31ba033..03e4862cc 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2457,10 +2457,10 @@ struct sqlite3_mem_methods { ** either generated columns or decending indexes. ** </dd> -** [[SQLITE_DBCONFIG_STMT_SCANSTATS]] -** <dt>SQLITE_DBCONFIG_STMT_SCANSTATS</td> -** <dd>The SQLITE_DBCONFIG_STMT_SCANSTATS option is only useful in -** SQLITE_ENABLE_STMT_SCANSTATS builds. In this case, it sets or clears +** [[SQLITE_DBCONFIG_STMT_SCANSTATUS]] +** <dt>SQLITE_DBCONFIG_STMT_SCANSTATUS</td> +** <dd>The SQLITE_DBCONFIG_STMT_SCANSTATUS option is only useful in +** SQLITE_ENABLE_STMT_SCANSTATUS builds. In this case, it sets or clears ** a flag that enables collection of the sqlite3_stmt_scanstatus_v2() ** statistics. For statistics to be collected, the flag must be set on ** the database handle both when the SQL statement is prepared and when it @@ -2486,7 +2486,7 @@ struct sqlite3_mem_methods { #define SQLITE_DBCONFIG_ENABLE_VIEW 1015 /* int int* */ #define SQLITE_DBCONFIG_LEGACY_FILE_FORMAT 1016 /* int int* */ #define SQLITE_DBCONFIG_TRUSTED_SCHEMA 1017 /* int int* */ -#define SQLITE_DBCONFIG_STMT_SCANSTATS 1018 /* int int* */ +#define SQLITE_DBCONFIG_STMT_SCANSTATUS 1018 /* int int* */ #define SQLITE_DBCONFIG_MAX 1018 /* Largest DBCONFIG */ /* diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 21ad2fa7e..e97fed25f 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1757,7 +1757,7 @@ struct sqlite3 { #define SQLITE_NullCallback 0x00000100 /* Invoke the callback once if the */ /* result set is empty */ #define SQLITE_IgnoreChecks 0x00000200 /* Do not enforce check constraints */ -#define SQLITE_StmtScanStats 0x00000400 /* Enable stmt_scanstats() counters */ +#define SQLITE_StmtScanStatus 0x00000400 /* Enable stmt_scanstats() counters */ #define SQLITE_NoCkptOnClose 0x00000800 /* No checkpoint on close()/DETACH */ #define SQLITE_ReverseOrder 0x00001000 /* Reverse unordered SELECTs */ #define SQLITE_RecTriggers 0x00002000 /* Enable recursive triggers */ @@ -5583,7 +5583,7 @@ sqlite3_uint64 sqlite3Hwtime(void); #endif #ifdef SQLITE_ENABLE_STMT_SCANSTATUS -# define IS_STMT_SCANSTATUS(db) (db->flags & SQLITE_StmtScanStats) +# define IS_STMT_SCANSTATUS(db) (db->flags & SQLITE_StmtScanStatus) #else # define IS_STMT_SCANSTATUS(db) 0 #endif diff --git a/src/test1.c b/src/test1.c index a765a66fa..a4cfd28ab 100644 --- a/src/test1.c +++ b/src/test1.c @@ -8313,7 +8313,7 @@ static int SQLITE_TCLAPI test_sqlite3_db_config( { "DQS_DML", SQLITE_DBCONFIG_DQS_DML }, { "DQS_DDL", SQLITE_DBCONFIG_DQS_DDL }, { "LEGACY_FILE_FORMAT", SQLITE_DBCONFIG_LEGACY_FILE_FORMAT }, - { "STMT_SCANSTATS", SQLITE_DBCONFIG_STMT_SCANSTATS }, + { "STMT_SCANSTATUS", SQLITE_DBCONFIG_STMT_SCANSTATUS }, }; int i; int v = 0; |