@@ -4996,7 +4996,6 @@ int sqlite3_decimal_init(
49964996 const sqlite3_api_routines *pApi
49974997){
49984998 int rc = SQLITE_OK;
4999- SQLITE_EXTENSION_INIT2(pApi);
50004999 static const struct {
50015000 const char *zFuncName;
50025001 int nArg;
@@ -5011,6 +5010,8 @@ int sqlite3_decimal_init(
50115010 unsigned int i;
50125011 (void)pzErrMsg; /* Unused parameter */
50135012
5013+ SQLITE_EXTENSION_INIT2(pApi);
5014+
50145015 for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
50155016 rc = sqlite3_create_function(db, aFunc[i].zFuncName, aFunc[i].nArg,
50165017 SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
@@ -12466,7 +12467,7 @@ static void explain_data_delete(ShellState *p){
1246612467** Disable and restore .wheretrace and .selecttrace settings.
1246712468*/
1246812469#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
12469- extern int sqlite3SelectTrace ;
12470+ extern unsigned int sqlite3_unsupported_selecttrace ;
1247012471static int savedSelectTrace;
1247112472#endif
1247212473#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
@@ -12475,8 +12476,8 @@ static int savedWhereTrace;
1247512476#endif
1247612477static void disable_debug_trace_modes(void){
1247712478#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
12478- savedSelectTrace = sqlite3SelectTrace ;
12479- sqlite3SelectTrace = 0;
12479+ savedSelectTrace = sqlite3_unsupported_selecttrace ;
12480+ sqlite3_unsupported_selecttrace = 0;
1248012481#endif
1248112482#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
1248212483 savedWhereTrace = sqlite3WhereTrace;
@@ -12485,7 +12486,7 @@ static void disable_debug_trace_modes(void){
1248512486}
1248612487static void restore_debug_trace_modes(void){
1248712488#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
12488- sqlite3SelectTrace = savedSelectTrace;
12489+ sqlite3_unsupported_selecttrace = savedSelectTrace;
1248912490#endif
1249012491#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
1249112492 sqlite3WhereTrace = savedWhereTrace;
@@ -18755,7 +18756,7 @@ static int do_meta_command(char *zLine, ShellState *p){
1875518756
1875618757#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
1875718758 if( c=='s' && n==11 && strncmp(azArg[0], "selecttrace", n)==0 ){
18758- sqlite3SelectTrace = nArg>=2 ? (int)integerValue(azArg[1]) : 0xffff;
18759+ sqlite3_unsupported_selecttrace = nArg>=2 ? (int)integerValue(azArg[1]) : 0xffff;
1875918760 }else
1876018761#endif
1876118762
0 commit comments