SQLite: Check-in [90249559]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Remove the SQLITE_OMIT_CONFLICT_CLAUSE preprocessor define which was no longer in use.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	9024955973e90661c99efa2aad1f8c421ee93802
User & Date:	drh 2011-06-20 20:15:53

Context

2011-06-20
20:39		Fix documentation typos. No changes to code. (check-in: 3276f3f7 user: drh tags: trunk)
20:15		Remove the SQLITE_OMIT_CONFLICT_CLAUSE preprocessor define which was no longer in use. (check-in: 90249559 user: drh tags: trunk)
19:00		More compiler warning fixes. (check-in: ed2dda93 user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/test_config.c.

   221    221   
   222    222   #ifdef SQLITE_OMIT_COMPOUND_SELECT
   223    223     Tcl_SetVar2(interp, "sqlite_options", "compound", "0", TCL_GLOBAL_ONLY);
   224    224   #else
   225    225     Tcl_SetVar2(interp, "sqlite_options", "compound", "1", TCL_GLOBAL_ONLY);
   226    226   #endif
   227    227   
   228         -#ifdef SQLITE_OMIT_CONFLICT_CLAUSE
   229         -  Tcl_SetVar2(interp, "sqlite_options", "conflict", "0", TCL_GLOBAL_ONLY);
   230         -#else
   231    228     Tcl_SetVar2(interp, "sqlite_options", "conflict", "1", TCL_GLOBAL_ONLY);
   232         -#endif
   233    229   
   234    230   #if SQLITE_OS_UNIX
   235    231     Tcl_SetVar2(interp, "sqlite_options", "crashtest", "1", TCL_GLOBAL_ONLY);
   236    232   #else
   237    233     Tcl_SetVar2(interp, "sqlite_options", "crashtest", "0", TCL_GLOBAL_ONLY);
   238    234   #endif
   239    235