Merge latest trunk changes with this branch.

FossilOrigin-Name: 99222bb3e5f9b2a9a10d9561a9fd8c0f717baaff

3 files changed, 21 insertions, 1 deletions

diff --git a/test/distinct.test b/test/distinct.test
index 2fb90dc3e..dac2269b0 100644
--- a/test/distinct.test
+++ b/test/distinct.test
@@ -252,4 +252,21 @@ do_execsql_test 5.6 {
   SELECT DISTINCT x FROM t1 ORDER BY x;
 } {1 2 3 4 5 6}
 
+#-------------------------------------------------------------------------
+# 2015-11-23.  Problem discovered by Kostya Serebryany using libFuzzer
+#
+db close
+sqlite3 db :memory:
+do_execsql_test 6.1 {
+  CREATE TABLE jjj(x);
+  SELECT (SELECT 'mmm' UNION SELECT DISTINCT max(name) ORDER BY 1) 
+    FROM sqlite_master;
+} {jjj}
+do_execsql_test 6.2 {
+  CREATE TABLE nnn(x);
+  SELECT (SELECT 'mmm' UNION SELECT DISTINCT max(name) ORDER BY 1) 
+    FROM sqlite_master;
+} {mmm}
+
+
 finish_test
diff --git a/test/hexlit.test b/test/hexlit.test
index 2edd458e8..c48930b49 100644
--- a/test/hexlit.test
+++ b/test/hexlit.test
@@ -109,6 +109,9 @@ do_execsql_test hexlit-301 {
 do_catchsql_test hexlist-400 {
   SELECT 0x10000000000000000;
 } {1 {hex literal too big: 0x10000000000000000}}
+do_catchsql_test hexlist-401 {
+  SELECT DISTINCT 0x10000000000000000;
+} {1 {hex literal too big: 0x10000000000000000}}
 do_catchsql_test hexlist-410 {
   DROP TABLE IF EXISTS t1;
   CREATE TABLE t1(x);
diff --git a/test/syscall.test b/test/syscall.test
index 83b8b8b40..a935957d3 100644
--- a/test/syscall.test
+++ b/test/syscall.test
@@ -60,7 +60,7 @@ foreach s {
     open close access getcwd stat fstat ftruncate
     fcntl read pread write pwrite fchmod fallocate
     pread64 pwrite64 unlink openDirectory mkdir rmdir 
-    statvfs fchown umask mmap munmap mremap
+    statvfs fchown geteuid umask mmap munmap mremap
     getpagesize readlink
 } {
   if {[test_syscall exists $s]} {lappend syscall_list $s}