6424438 Winchester: ID mapping for AD Interoperability

--HG--
rename : usr/src/cmd/svc/configd/sqlite/src/shell.c => usr/src/cmd/sqlite/shell.c
rename : usr/src/cmd/svc/configd/sqlite/Makefile => usr/src/lib/libsqlite/Makefile.com
rename : usr/src/cmd/svc/configd/sqlite/inc.flg => usr/src/lib/libsqlite/inc.flg
rename : usr/src/cmd/svc/configd/sqlite/llib-lsqlite => usr/src/lib/libsqlite/llib-lsqlite
rename : usr/src/cmd/svc/configd/sqlite/main.mk => usr/src/lib/libsqlite/main.mk
rename : usr/src/cmd/svc/configd/sqlite/mapfile-sqlite => usr/src/lib/libsqlite/mapfile-sqlite
rename : usr/src/cmd/svc/configd/sqlite/sqlite-misc.h => usr/src/lib/libsqlite/sqlite-misc.h
rename : usr/src/cmd/svc/configd/sqlite/src/attach.c => usr/src/lib/libsqlite/src/attach.c
rename : usr/src/cmd/svc/configd/sqlite/src/auth.c => usr/src/lib/libsqlite/src/auth.c
rename : usr/src/cmd/svc/configd/sqlite/src/btree.c => usr/src/lib/libsqlite/src/btree.c
rename : usr/src/cmd/svc/configd/sqlite/src/btree.h => usr/src/lib/libsqlite/src/btree.h
rename : usr/src/cmd/svc/configd/sqlite/src/btree_rb.c => usr/src/lib/libsqlite/src/btree_rb.c
rename : usr/src/cmd/svc/configd/sqlite/src/build.c => usr/src/lib/libsqlite/src/build.c
rename : usr/src/cmd/svc/configd/sqlite/src/config.h => usr/src/lib/libsqlite/src/config.h
rename : usr/src/cmd/svc/configd/sqlite/src/copy.c => usr/src/lib/libsqlite/src/copy.c
rename : usr/src/cmd/svc/configd/sqlite/src/date.c => usr/src/lib/libsqlite/src/date.c
rename : usr/src/cmd/svc/configd/sqlite/src/delete.c => usr/src/lib/libsqlite/src/delete.c
rename : usr/src/cmd/svc/configd/sqlite/src/encode.c => usr/src/lib/libsqlite/src/encode.c
rename : usr/src/cmd/svc/configd/sqlite/src/expr.c => usr/src/lib/libsqlite/src/expr.c
rename : usr/src/cmd/svc/configd/sqlite/src/func.c => usr/src/lib/libsqlite/src/func.c
rename : usr/src/cmd/svc/configd/sqlite/src/hash.c => usr/src/lib/libsqlite/src/hash.c
rename : usr/src/cmd/svc/configd/sqlite/src/hash.h => usr/src/lib/libsqlite/src/hash.h
rename : usr/src/cmd/svc/configd/sqlite/src/insert.c => usr/src/lib/libsqlite/src/insert.c
rename : usr/src/cmd/svc/configd/sqlite/src/main.c => usr/src/lib/libsqlite/src/main.c
rename : usr/src/cmd/svc/configd/sqlite/src/md5.c => usr/src/lib/libsqlite/src/md5.c
rename : usr/src/cmd/svc/configd/sqlite/src/os.c => usr/src/lib/libsqlite/src/os.c
rename : usr/src/cmd/svc/configd/sqlite/src/os.h => usr/src/lib/libsqlite/src/os.h
rename : usr/src/cmd/svc/configd/sqlite/src/pager.c => usr/src/lib/libsqlite/src/pager.c
rename : usr/src/cmd/svc/configd/sqlite/src/pager.h => usr/src/lib/libsqlite/src/pager.h
rename : usr/src/cmd/svc/configd/sqlite/src/parse.y => usr/src/lib/libsqlite/src/parse.y
rename : usr/src/cmd/svc/configd/sqlite/src/pragma.c => usr/src/lib/libsqlite/src/pragma.c
rename : usr/src/cmd/svc/configd/sqlite/src/printf.c => usr/src/lib/libsqlite/src/printf.c
rename : usr/src/cmd/svc/configd/sqlite/src/random.c => usr/src/lib/libsqlite/src/random.c
rename : usr/src/cmd/svc/configd/sqlite/src/select.c => usr/src/lib/libsqlite/src/select.c
rename : usr/src/cmd/svc/configd/sqlite/src/sqlite.h.in => usr/src/lib/libsqlite/src/sqlite.h.in
rename : usr/src/cmd/svc/configd/sqlite/src/sqliteInt.h => usr/src/lib/libsqlite/src/sqliteInt.h
rename : usr/src/cmd/svc/configd/sqlite/src/table.c => usr/src/lib/libsqlite/src/table.c
rename : usr/src/cmd/svc/configd/sqlite/src/tclsqlite.c => usr/src/lib/libsqlite/src/tclsqlite.c
rename : usr/src/cmd/svc/configd/sqlite/src/test1.c => usr/src/lib/libsqlite/src/test1.c
rename : usr/src/cmd/svc/configd/sqlite/src/test2.c => usr/src/lib/libsqlite/src/test2.c
rename : usr/src/cmd/svc/configd/sqlite/src/test3.c => usr/src/lib/libsqlite/src/test3.c
rename : usr/src/cmd/svc/configd/sqlite/src/test4.c => usr/src/lib/libsqlite/src/test4.c
rename : usr/src/cmd/svc/configd/sqlite/src/tokenize.c => usr/src/lib/libsqlite/src/tokenize.c
rename : usr/src/cmd/svc/configd/sqlite/src/trigger.c => usr/src/lib/libsqlite/src/trigger.c
rename : usr/src/cmd/svc/configd/sqlite/src/update.c => usr/src/lib/libsqlite/src/update.c
rename : usr/src/cmd/svc/configd/sqlite/src/util.c => usr/src/lib/libsqlite/src/util.c
rename : usr/src/cmd/svc/configd/sqlite/src/vacuum.c => usr/src/lib/libsqlite/src/vacuum.c
rename : usr/src/cmd/svc/configd/sqlite/src/vdbe.c => usr/src/lib/libsqlite/src/vdbe.c
rename : usr/src/cmd/svc/configd/sqlite/src/vdbe.h => usr/src/lib/libsqlite/src/vdbe.h
rename : usr/src/cmd/svc/configd/sqlite/src/vdbeInt.h => usr/src/lib/libsqlite/src/vdbeInt.h
rename : usr/src/cmd/svc/configd/sqlite/src/vdbeaux.c => usr/src/lib/libsqlite/src/vdbeaux.c
rename : usr/src/cmd/svc/configd/sqlite/src/where.c => usr/src/lib/libsqlite/src/where.c
rename : usr/src/cmd/svc/configd/sqlite/test/all.test => usr/src/lib/libsqlite/test/all.test
rename : usr/src/cmd/svc/configd/sqlite/test/attach.test => usr/src/lib/libsqlite/test/attach.test
rename : usr/src/cmd/svc/configd/sqlite/test/attach2.test => usr/src/lib/libsqlite/test/attach2.test
rename : usr/src/cmd/svc/configd/sqlite/test/auth.test => usr/src/lib/libsqlite/test/auth.test
rename : usr/src/cmd/svc/configd/sqlite/test/bigfile.test => usr/src/lib/libsqlite/test/bigfile.test
rename : usr/src/cmd/svc/configd/sqlite/test/bigrow.test => usr/src/lib/libsqlite/test/bigrow.test
rename : usr/src/cmd/svc/configd/sqlite/test/bind.test => usr/src/lib/libsqlite/test/bind.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree.test => usr/src/lib/libsqlite/test/btree.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree2.test => usr/src/lib/libsqlite/test/btree2.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree3.test => usr/src/lib/libsqlite/test/btree3.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree3rb.test => usr/src/lib/libsqlite/test/btree3rb.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree4.test => usr/src/lib/libsqlite/test/btree4.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree4rb.test => usr/src/lib/libsqlite/test/btree4rb.test
rename : usr/src/cmd/svc/configd/sqlite/test/capi2.test => usr/src/lib/libsqlite/test/capi2.test
rename : usr/src/cmd/svc/configd/sqlite/test/conflict.test => usr/src/lib/libsqlite/test/conflict.test
rename : usr/src/cmd/svc/configd/sqlite/test/copy.test => usr/src/lib/libsqlite/test/copy.test
rename : usr/src/cmd/svc/configd/sqlite/test/crashme2.off => usr/src/lib/libsqlite/test/crashme2.off
rename : usr/src/cmd/svc/configd/sqlite/test/crashtest1.c => usr/src/lib/libsqlite/test/crashtest1.c
rename : usr/src/cmd/svc/configd/sqlite/test/date.test => usr/src/lib/libsqlite/test/date.test
rename : usr/src/cmd/svc/configd/sqlite/test/delete.test => usr/src/lib/libsqlite/test/delete.test
rename : usr/src/cmd/svc/configd/sqlite/test/expr.test => usr/src/lib/libsqlite/test/expr.test
rename : usr/src/cmd/svc/configd/sqlite/test/fkey1.test => usr/src/lib/libsqlite/test/fkey1.test
rename : usr/src/cmd/svc/configd/sqlite/test/format3.test => usr/src/lib/libsqlite/test/format3.test
rename : usr/src/cmd/svc/configd/sqlite/test/func.test => usr/src/lib/libsqlite/test/func.test
rename : usr/src/cmd/svc/configd/sqlite/test/hook.test => usr/src/lib/libsqlite/test/hook.test
rename : usr/src/cmd/svc/configd/sqlite/test/in.test => usr/src/lib/libsqlite/test/in.test
rename : usr/src/cmd/svc/configd/sqlite/test/index.test => usr/src/lib/libsqlite/test/index.test
rename : usr/src/cmd/svc/configd/sqlite/test/insert.test => usr/src/lib/libsqlite/test/insert.test
rename : usr/src/cmd/svc/configd/sqlite/test/insert2.test => usr/src/lib/libsqlite/test/insert2.test
rename : usr/src/cmd/svc/configd/sqlite/test/interrupt.test => usr/src/lib/libsqlite/test/interrupt.test
rename : usr/src/cmd/svc/configd/sqlite/test/intpkey.test => usr/src/lib/libsqlite/test/intpkey.test
rename : usr/src/cmd/svc/configd/sqlite/test/ioerr.test => usr/src/lib/libsqlite/test/ioerr.test
rename : usr/src/cmd/svc/configd/sqlite/test/join.test => usr/src/lib/libsqlite/test/join.test
rename : usr/src/cmd/svc/configd/sqlite/test/join2.test => usr/src/lib/libsqlite/test/join2.test
rename : usr/src/cmd/svc/configd/sqlite/test/join3_28.test => usr/src/lib/libsqlite/test/join3_28.test
rename : usr/src/cmd/svc/configd/sqlite/test/join4_28.test => usr/src/lib/libsqlite/test/join4_28.test
rename : usr/src/cmd/svc/configd/sqlite/test/lastinsert.test => usr/src/lib/libsqlite/test/lastinsert.test
rename : usr/src/cmd/svc/configd/sqlite/test/laststmtchanges.test => usr/src/lib/libsqlite/test/laststmtchanges.test
rename : usr/src/cmd/svc/configd/sqlite/test/limit.test => usr/src/lib/libsqlite/test/limit.test
rename : usr/src/cmd/svc/configd/sqlite/test/lock.test => usr/src/lib/libsqlite/test/lock.test
rename : usr/src/cmd/svc/configd/sqlite/test/main.test => usr/src/lib/libsqlite/test/main.test
rename : usr/src/cmd/svc/configd/sqlite/test/malloc.test => usr/src/lib/libsqlite/test/malloc.test
rename : usr/src/cmd/svc/configd/sqlite/test/memdb.test => usr/src/lib/libsqlite/test/memdb.test
rename : usr/src/cmd/svc/configd/sqlite/test/memleak.test => usr/src/lib/libsqlite/test/memleak.test
rename : usr/src/cmd/svc/configd/sqlite/test/minmax.test => usr/src/lib/libsqlite/test/minmax.test
rename : usr/src/cmd/svc/configd/sqlite/test/misc1.test => usr/src/lib/libsqlite/test/misc1.test
rename : usr/src/cmd/svc/configd/sqlite/test/misc2.test => usr/src/lib/libsqlite/test/misc2.test
rename : usr/src/cmd/svc/configd/sqlite/test/misc3.test => usr/src/lib/libsqlite/test/misc3.test
rename : usr/src/cmd/svc/configd/sqlite/test/misuse.test => usr/src/lib/libsqlite/test/misuse.test
rename : usr/src/cmd/svc/configd/sqlite/test/notnull.test => usr/src/lib/libsqlite/test/notnull.test
rename : usr/src/cmd/svc/configd/sqlite/test/null.test => usr/src/lib/libsqlite/test/null.test
rename : usr/src/cmd/svc/configd/sqlite/test/pager.test => usr/src/lib/libsqlite/test/pager.test
rename : usr/src/cmd/svc/configd/sqlite/test/pragma.test => usr/src/lib/libsqlite/test/pragma.test
rename : usr/src/cmd/svc/configd/sqlite/test/printf.test => usr/src/lib/libsqlite/test/printf.test
rename : usr/src/cmd/svc/configd/sqlite/test/progress.test => usr/src/lib/libsqlite/test/progress.test
rename : usr/src/cmd/svc/configd/sqlite/test/quick.test => usr/src/lib/libsqlite/test/quick.test
rename : usr/src/cmd/svc/configd/sqlite/test/quote.test => usr/src/lib/libsqlite/test/quote.test
rename : usr/src/cmd/svc/configd/sqlite/test/rowid.test => usr/src/lib/libsqlite/test/rowid.test
rename : usr/src/cmd/svc/configd/sqlite/test/select1.test => usr/src/lib/libsqlite/test/select1.test
rename : usr/src/cmd/svc/configd/sqlite/test/select2.test => usr/src/lib/libsqlite/test/select2.test
rename : usr/src/cmd/svc/configd/sqlite/test/select3.test => usr/src/lib/libsqlite/test/select3.test
rename : usr/src/cmd/svc/configd/sqlite/test/select4.test => usr/src/lib/libsqlite/test/select4.test
rename : usr/src/cmd/svc/configd/sqlite/test/select5.test => usr/src/lib/libsqlite/test/select5.test
rename : usr/src/cmd/svc/configd/sqlite/test/select6.test => usr/src/lib/libsqlite/test/select6.test
rename : usr/src/cmd/svc/configd/sqlite/test/sort.test => usr/src/lib/libsqlite/test/sort.test
rename : usr/src/cmd/svc/configd/sqlite/test/subselect.test => usr/src/lib/libsqlite/test/subselect.test
rename : usr/src/cmd/svc/configd/sqlite/test/table.test => usr/src/lib/libsqlite/test/table.test
rename : usr/src/cmd/svc/configd/sqlite/test/tableapi.test => usr/src/lib/libsqlite/test/tableapi.test
rename : usr/src/cmd/svc/configd/sqlite/test/tclsqlite.test => usr/src/lib/libsqlite/test/tclsqlite.test
rename : usr/src/cmd/svc/configd/sqlite/test/temptable.test => usr/src/lib/libsqlite/test/temptable.test
rename : usr/src/cmd/svc/configd/sqlite/test/tester.tcl => usr/src/lib/libsqlite/test/tester.tcl
rename : usr/src/cmd/svc/configd/sqlite/test/thread1.test => usr/src/lib/libsqlite/test/thread1.test
rename : usr/src/cmd/svc/configd/sqlite/test/threadtest1.c => usr/src/lib/libsqlite/test/threadtest1.c
rename : usr/src/cmd/svc/configd/sqlite/test/threadtest2.c => usr/src/lib/libsqlite/test/threadtest2.c
rename : usr/src/cmd/svc/configd/sqlite/test/trans.test => usr/src/lib/libsqlite/test/trans.test
rename : usr/src/cmd/svc/configd/sqlite/test/trigger1.test => usr/src/lib/libsqlite/test/trigger1.test
rename : usr/src/cmd/svc/configd/sqlite/test/trigger2.test => usr/src/lib/libsqlite/test/trigger2.test
rename : usr/src/cmd/svc/configd/sqlite/test/trigger3.test => usr/src/lib/libsqlite/test/trigger3.test
rename : usr/src/cmd/svc/configd/sqlite/test/trigger4.test => usr/src/lib/libsqlite/test/trigger4.test
rename : usr/src/cmd/svc/configd/sqlite/test/unique.test => usr/src/lib/libsqlite/test/unique.test
rename : usr/src/cmd/svc/configd/sqlite/test/update.test => usr/src/lib/libsqlite/test/update.test
rename : usr/src/cmd/svc/configd/sqlite/test/vacuum.test => usr/src/lib/libsqlite/test/vacuum.test
rename : usr/src/cmd/svc/configd/sqlite/test/version.test => usr/src/lib/libsqlite/test/version.test
rename : usr/src/cmd/svc/configd/sqlite/test/view.test => usr/src/lib/libsqlite/test/view.test
rename : usr/src/cmd/svc/configd/sqlite/test/where.test => usr/src/lib/libsqlite/test/where.test
rename : usr/src/cmd/svc/configd/sqlite/tool/diffdb.c => usr/src/lib/libsqlite/tool/diffdb.c
rename : usr/src/cmd/svc/configd/sqlite/tool/lemon.c => usr/src/lib/libsqlite/tool/lemon.c
rename : usr/src/cmd/svc/configd/sqlite/tool/lempar.c => usr/src/lib/libsqlite/tool/lempar.c
rename : usr/src/cmd/svc/configd/sqlite/tool/memleak.awk => usr/src/lib/libsqlite/tool/memleak.awk
rename : usr/src/cmd/svc/configd/sqlite/tool/memleak2.awk => usr/src/lib/libsqlite/tool/memleak2.awk
rename : usr/src/cmd/svc/configd/sqlite/tool/mkopts.tcl => usr/src/lib/libsqlite/tool/mkopts.tcl
rename : usr/src/cmd/svc/configd/sqlite/tool/opcodeDoc.awk => usr/src/lib/libsqlite/tool/opcodeDoc.awk
rename : usr/src/cmd/svc/configd/sqlite/tool/report1.txt => usr/src/lib/libsqlite/tool/report1.txt
rename : usr/src/cmd/svc/configd/sqlite/tool/showdb.c => usr/src/lib/libsqlite/tool/showdb.c
rename : usr/src/cmd/svc/configd/sqlite/tool/showjournal.c => usr/src/lib/libsqlite/tool/showjournal.c
rename : usr/src/cmd/svc/configd/sqlite/tool/space_used.tcl => usr/src/lib/libsqlite/tool/space_used.tcl
rename : usr/src/cmd/svc/configd/sqlite/tool/spaceanal.tcl => usr/src/lib/libsqlite/tool/spaceanal.tcl
rename : usr/src/cmd/svc/configd/sqlite/tool/speedtest.tcl => usr/src/lib/libsqlite/tool/speedtest.tcl
rename : usr/src/cmd/svc/configd/sqlite/tool/speedtest2.tcl => usr/src/lib/libsqlite/tool/speedtest2.tcl

1 files changed, 498 insertions, 0 deletions

diff --git a/usr/src/lib/libsqlite/test/select4.test b/usr/src/lib/libsqlite/test/select4.test
new file mode 100644
index 0000000000..8fb34a2156
--- /dev/null
+++ b/usr/src/lib/libsqlite/test/select4.test
@@ -0,0 +1,498 @@
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+# 2001 September 15
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.  The
+# focus of this file is testing UNION, INTERSECT and EXCEPT operators
+# in SELECT statements.
+#
+# $Id: select4.test,v 1.13 2003/02/02 12:41:27 drh Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# Build some test data
+#
+set fd [open data1.txt w]
+for {set i 1} {$i<32} {incr i} {
+  for {set j 0} {pow(2,$j)<$i} {incr j} {}
+  puts $fd "$i\t$j"
+}
+close $fd
+execsql {
+  CREATE TABLE t1(n int, log int);
+  COPY t1 FROM 'data1.txt'
+}
+file delete data1.txt
+
+do_test select4-1.0 {
+  execsql {SELECT DISTINCT log FROM t1 ORDER BY log}
+} {0 1 2 3 4 5}
+
+# Union All operator
+#
+do_test select4-1.1a {
+  lsort [execsql {SELECT DISTINCT log FROM t1}]
+} {0 1 2 3 4 5}
+do_test select4-1.1b {
+  lsort [execsql {SELECT n FROM t1 WHERE log=3}]
+} {5 6 7 8}
+do_test select4-1.1c {
+  execsql {
+    SELECT DISTINCT log FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }
+} {0 1 2 3 4 5 5 6 7 8}
+do_test select4-1.1d {
+  execsql {
+    CREATE TABLE t2 AS
+      SELECT DISTINCT log FROM t1
+      UNION ALL
+      SELECT n FROM t1 WHERE log=3
+      ORDER BY log;
+    SELECT * FROM t2;
+  }
+} {0 1 2 3 4 5 5 6 7 8}
+execsql {DROP TABLE t2}
+do_test select4-1.1e {
+  execsql {
+    CREATE TABLE t2 AS
+      SELECT DISTINCT log FROM t1
+      UNION ALL
+      SELECT n FROM t1 WHERE log=3
+      ORDER BY log DESC;
+    SELECT * FROM t2;
+  }
+} {8 7 6 5 5 4 3 2 1 0}
+execsql {DROP TABLE t2}
+do_test select4-1.1f {
+  execsql {
+    SELECT DISTINCT log FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=2
+  }
+} {0 1 2 3 4 5 3 4}
+do_test select4-1.1g {
+  execsql {
+    CREATE TABLE t2 AS 
+      SELECT DISTINCT log FROM t1
+      UNION ALL
+      SELECT n FROM t1 WHERE log=2;
+    SELECT * FROM t2;
+  }
+} {0 1 2 3 4 5 3 4}
+execsql {DROP TABLE t2}
+do_test select4-1.2 {
+  execsql {
+    SELECT log FROM t1 WHERE n IN 
+      (SELECT DISTINCT log FROM t1 UNION ALL
+       SELECT n FROM t1 WHERE log=3)
+    ORDER BY log;
+  }
+} {0 1 2 2 3 3 3 3}
+do_test select4-1.3 {
+  set v [catch {execsql {
+    SELECT DISTINCT log FROM t1 ORDER BY log
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }} msg]
+  lappend v $msg
+} {1 {ORDER BY clause should come after UNION ALL not before}}
+
+# Union operator
+#
+do_test select4-2.1 {
+  execsql {
+    SELECT DISTINCT log FROM t1
+    UNION
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }
+} {0 1 2 3 4 5 6 7 8}
+do_test select4-2.2 {
+  execsql {
+    SELECT log FROM t1 WHERE n IN 
+      (SELECT DISTINCT log FROM t1 UNION
+       SELECT n FROM t1 WHERE log=3)
+    ORDER BY log;
+  }
+} {0 1 2 2 3 3 3 3}
+do_test select4-2.3 {
+  set v [catch {execsql {
+    SELECT DISTINCT log FROM t1 ORDER BY log
+    UNION
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }} msg]
+  lappend v $msg
+} {1 {ORDER BY clause should come after UNION not before}}
+
+# Except operator
+#
+do_test select4-3.1.1 {
+  execsql {
+    SELECT DISTINCT log FROM t1
+    EXCEPT
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }
+} {0 1 2 3 4}
+do_test select4-3.1.2 {
+  execsql {
+    CREATE TABLE t2 AS 
+      SELECT DISTINCT log FROM t1
+      EXCEPT
+      SELECT n FROM t1 WHERE log=3
+      ORDER BY log;
+    SELECT * FROM t2;
+  }
+} {0 1 2 3 4}
+execsql {DROP TABLE t2}
+do_test select4-3.1.3 {
+  execsql {
+    CREATE TABLE t2 AS 
+      SELECT DISTINCT log FROM t1
+      EXCEPT
+      SELECT n FROM t1 WHERE log=3
+      ORDER BY log DESC;
+    SELECT * FROM t2;
+  }
+} {4 3 2 1 0}
+execsql {DROP TABLE t2}
+do_test select4-3.2 {
+  execsql {
+    SELECT log FROM t1 WHERE n IN 
+      (SELECT DISTINCT log FROM t1 EXCEPT
+       SELECT n FROM t1 WHERE log=3)
+    ORDER BY log;
+  }
+} {0 1 2 2}
+do_test select4-3.3 {
+  set v [catch {execsql {
+    SELECT DISTINCT log FROM t1 ORDER BY log
+    EXCEPT
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }} msg]
+  lappend v $msg
+} {1 {ORDER BY clause should come after EXCEPT not before}}
+
+# Intersect operator
+#
+do_test select4-4.1.1 {
+  execsql {
+    SELECT DISTINCT log FROM t1
+    INTERSECT
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }
+} {5}
+do_test select4-4.1.2 {
+  execsql {
+    SELECT DISTINCT log FROM t1 UNION ALL SELECT 6
+    INTERSECT
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }
+} {5 6}
+do_test select4-4.1.3 {
+  execsql {
+    CREATE TABLE t2 AS
+      SELECT DISTINCT log FROM t1 UNION ALL SELECT 6
+      INTERSECT
+      SELECT n FROM t1 WHERE log=3
+      ORDER BY log;
+    SELECT * FROM t2;
+  }
+} {5 6}
+execsql {DROP TABLE t2}
+do_test select4-4.1.4 {
+  execsql {
+    CREATE TABLE t2 AS
+      SELECT DISTINCT log FROM t1 UNION ALL SELECT 6
+      INTERSECT
+      SELECT n FROM t1 WHERE log=3
+      ORDER BY log DESC;
+    SELECT * FROM t2;
+  }
+} {6 5}
+execsql {DROP TABLE t2}
+do_test select4-4.2 {
+  execsql {
+    SELECT log FROM t1 WHERE n IN 
+      (SELECT DISTINCT log FROM t1 INTERSECT
+       SELECT n FROM t1 WHERE log=3)
+    ORDER BY log;
+  }
+} {3}
+do_test select4-4.3 {
+  set v [catch {execsql {
+    SELECT DISTINCT log FROM t1 ORDER BY log
+    INTERSECT
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }} msg]
+  lappend v $msg
+} {1 {ORDER BY clause should come after INTERSECT not before}}
+
+# Various error messages while processing UNION or INTERSECT
+#
+do_test select4-5.1 {
+  set v [catch {execsql {
+    SELECT DISTINCT log FROM t2
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }} msg]
+  lappend v $msg
+} {1 {no such table: t2}}
+do_test select4-5.2 {
+  set v [catch {execsql {
+    SELECT DISTINCT log AS "xyzzy" FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY xyzzy;
+  }} msg]
+  lappend v $msg
+} {0 {0 1 2 3 4 5 5 6 7 8}}
+do_test select4-5.2b {
+  set v [catch {execsql {
+    SELECT DISTINCT log AS xyzzy FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY 'xyzzy';
+  }} msg]
+  lappend v $msg
+} {0 {0 1 2 3 4 5 5 6 7 8}}
+do_test select4-5.2c {
+  set v [catch {execsql {
+    SELECT DISTINCT log FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY 'xyzzy';
+  }} msg]
+  lappend v $msg
+} {1 {ORDER BY term number 1 does not match any result column}}
+do_test select4-5.2d {
+  set v [catch {execsql {
+    SELECT DISTINCT log FROM t1
+    INTERSECT
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY 'xyzzy';
+  }} msg]
+  lappend v $msg
+} {1 {ORDER BY term number 1 does not match any result column}}
+do_test select4-5.2e {
+  set v [catch {execsql {
+    SELECT DISTINCT log FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY n;
+  }} msg]
+  lappend v $msg
+} {0 {0 1 2 3 4 5 5 6 7 8}}
+do_test select4-5.2f {
+  catchsql {
+    SELECT DISTINCT log FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }
+} {0 {0 1 2 3 4 5 5 6 7 8}}
+do_test select4-5.2g {
+  catchsql {
+    SELECT DISTINCT log FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY 1;
+  }
+} {0 {0 1 2 3 4 5 5 6 7 8}}
+do_test select4-5.2h {
+  catchsql {
+    SELECT DISTINCT log FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY 2;
+  }
+} {1 {ORDER BY position 2 should be between 1 and 1}}
+do_test select4-5.2i {
+  catchsql {
+    SELECT DISTINCT 1, log FROM t1
+    UNION ALL
+    SELECT 2, n FROM t1 WHERE log=3
+    ORDER BY 2, 1;
+  }
+} {0 {1 0 1 1 1 2 1 3 1 4 1 5 2 5 2 6 2 7 2 8}}
+do_test select4-5.2j {
+  catchsql {
+    SELECT DISTINCT 1, log FROM t1
+    UNION ALL
+    SELECT 2, n FROM t1 WHERE log=3
+    ORDER BY 1, 2 DESC;
+  }
+} {0 {1 5 1 4 1 3 1 2 1 1 1 0 2 8 2 7 2 6 2 5}}
+do_test select4-5.2k {
+  catchsql {
+    SELECT DISTINCT 1, log FROM t1
+    UNION ALL
+    SELECT 2, n FROM t1 WHERE log=3
+    ORDER BY n, 1;
+  }
+} {0 {1 0 1 1 1 2 1 3 1 4 1 5 2 5 2 6 2 7 2 8}}
+do_test select4-5.3 {
+  set v [catch {execsql {
+    SELECT DISTINCT log, n FROM t1
+    UNION ALL
+    SELECT n FROM t1 WHERE log=3
+    ORDER BY log;
+  }} msg]
+  lappend v $msg
+} {1 {SELECTs to the left and right of UNION ALL do not have the same number of result columns}}
+do_test select4-5.4 {
+  set v [catch {execsql {
+    SELECT log FROM t1 WHERE n=2
+    UNION ALL
+    SELECT log FROM t1 WHERE n=3
+    UNION ALL
+    SELECT log FROM t1 WHERE n=4
+    UNION ALL
+    SELECT log FROM t1 WHERE n=5
+    ORDER BY log;
+  }} msg]
+  lappend v $msg
+} {0 {1 2 2 3}}
+
+do_test select4-6.1 {
+  execsql {
+    SELECT log, count(*) as cnt FROM t1 GROUP BY log
+    UNION
+    SELECT log, n FROM t1 WHERE n=7
+    ORDER BY cnt, log;
+  }
+} {0 1 1 1 2 2 3 4 3 7 4 8 5 15}
+do_test select4-6.2 {
+  execsql {
+    SELECT log, count(*) FROM t1 GROUP BY log
+    UNION
+    SELECT log, n FROM t1 WHERE n=7
+    ORDER BY count(*), log;
+  }
+} {0 1 1 1 2 2 3 4 3 7 4 8 5 15}
+
+# NULLs are indistinct for the UNION operator.
+# Make sure the UNION operator recognizes this
+#
+do_test select4-6.3 {
+  execsql {
+    SELECT NULL UNION SELECT NULL UNION
+    SELECT 1 UNION SELECT 2 AS 'x'
+    ORDER BY x;
+  }
+} {{} 1 2}
+do_test select4-6.3.1 {
+  execsql {
+    SELECT NULL UNION ALL SELECT NULL UNION ALL
+    SELECT 1 UNION ALL SELECT 2 AS 'x'
+    ORDER BY x;
+  }
+} {{} {} 1 2}
+
+# Make sure the DISTINCT keyword treats NULLs as indistinct.
+#
+do_test select4-6.4 {
+  execsql {
+    SELECT * FROM (
+       SELECT NULL, 1 UNION ALL SELECT NULL, 1
+    );
+  }
+} {{} 1 {} 1}
+do_test select4-6.5 {
+  execsql {
+    SELECT DISTINCT * FROM (
+       SELECT NULL, 1 UNION ALL SELECT NULL, 1
+    );
+  }
+} {{} 1}
+do_test select4-6.6 {
+  execsql {
+    SELECT DISTINCT * FROM (
+       SELECT 1,2  UNION ALL SELECT 1,2
+    );
+  }
+} {1 2}
+
+# Test distinctness of NULL in other ways.
+#
+do_test select4-6.7 {
+  execsql {
+    SELECT NULL EXCEPT SELECT NULL
+  }
+} {}
+
+
+# Make sure column names are correct when a compound select appears as
+# an expression in the WHERE clause.
+#
+do_test select4-7.1 {
+  execsql {
+    CREATE TABLE t2 AS SELECT log AS 'x', count(*) AS 'y' FROM t1 GROUP BY log;
+    SELECT * FROM t2 ORDER BY x;
+  }
+} {0 1 1 1 2 2 3 4 4 8 5 15}  
+do_test select4-7.2 {
+  execsql2 {
+    SELECT * FROM t1 WHERE n IN (SELECT n FROM t1 INTERSECT SELECT x FROM t2)
+    ORDER BY n
+  }
+} {n 1 log 0 n 2 log 1 n 3 log 2 n 4 log 2 n 5 log 3}
+do_test select4-7.3 {
+  execsql2 {
+    SELECT * FROM t1 WHERE n IN (SELECT n FROM t1 EXCEPT SELECT x FROM t2)
+    ORDER BY n LIMIT 2
+  }
+} {n 6 log 3 n 7 log 3}
+do_test select4-7.4 {
+  execsql2 {
+    SELECT * FROM t1 WHERE n IN (SELECT n FROM t1 UNION SELECT x FROM t2)
+    ORDER BY n LIMIT 2
+  }
+} {n 1 log 0 n 2 log 1}
+
+# Make sure DISTINCT works appropriately on TEXT and NUMERIC columns.
+#
+do_test select4-8.1 {
+  execsql {
+    BEGIN;
+    CREATE TABLE t3(a text, b float, c text);
+    INSERT INTO t3 VALUES(1, 1.1, '1.1');
+    INSERT INTO t3 VALUES(2, 1.10, '1.10');
+    INSERT INTO t3 VALUES(3, 1.10, '1.1');
+    INSERT INTO t3 VALUES(4, 1.1, '1.10');
+    INSERT INTO t3 VALUES(5, 1.2, '1.2');
+    INSERT INTO t3 VALUES(6, 1.3, '1.3');
+    COMMIT;
+  }
+  execsql {
+    SELECT DISTINCT b FROM t3 ORDER BY c;
+  }
+} {1.1 1.2 1.3}
+do_test select4-8.2 {
+  execsql {
+    SELECT DISTINCT c FROM t3 ORDER BY c;
+  }
+} {1.1 1.10 1.2 1.3}
+
+
+finish_test