]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Defer size checking on row-value assignments for when the RHS is a SELECT
authordrh <drh@noemail.net>
Tue, 3 Jan 2017 13:45:22 +0000 (13:45 +0000)
committerdrh <drh@noemail.net>
Tue, 3 Jan 2017 13:45:22 +0000 (13:45 +0000)
until after the "*" wildcards have been expanded.

FossilOrigin-Name: 36944be6be5c42096f5da84187ff203af26b08ae

1  2 
manifest
manifest.uuid
src/expr.c

diff --cc manifest
index 722fbd9e77cdea0763d91723822f55a556114d8b,4c09a2f8c3460fb8432f73987d016f3fb6461ea1..683b75d2aef36109b93a75ecf524f8adce10574f
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\stypo\son\sa\scomment.\s\sNo\scode\schanges.
- D 2017-01-03T11:59:54.675
 -C Improvements\sto\sthe\sway\svector\sassignment\ssize\schecking\sis\sdone.\s\sSize\schecks\nwhen\sthe\sRHS\sis\sa\sSELECT\sare\sdeferred\suntil\safter\s"*"\swildcards\sare\sexpanded.
 -D 2017-01-03T02:58:01.890
++C Defer\ssize\schecking\son\srow-value\sassignments\sfor\swhen\sthe\sRHS\sis\sa\sSELECT\nuntil\safter\sthe\s"*"\swildcards\shave\sbeen\sexpanded.
++D 2017-01-03T13:45:22.450
  F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@@ -341,7 -341,7 +341,7 @@@ F src/ctime.c 9f2296a4e5d26ebf0e0d95a0a
  F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
  F src/delete.c c8bc10d145c9666a34ae906250326fdaa8d58fa5
- F src/expr.c b5f55c29553c762b5d3ae3768b95b5d4e8c0303f
 -F src/expr.c 1df03961abc008b46154edca14bcbb38e7a3be90
++F src/expr.c 59418cecc99adfb5cdd6c088ff38c1dde827e077
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
  F src/func.c d8582ee91975975645f206db332c38f534b783ad
@@@ -1541,7 -1541,10 +1541,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 548532fdcf84d565c17aed79a6b595e8b62a3ab4
- R d91f1b1dc02838ee4304e6741bf506fa
 -P f12ed3ce0bfb2d94c9baad23fdcbd816c72439a1
 -R c698fe9c623530e3a7438be4c43f0c89
 -T *branch * vector-size-check
 -T *sym-vector-size-check *
 -T -sym-trunk *
++P abc27b6023e28a717bfa15648ddc152bda9c7b96 696219b11049930cdbc38f574820f4bbaf8621bb
++R 8e229780f94246cbc66f37b63195235a
++T +closed 696219b11049930cdbc38f574820f4bbaf8621bb
  U drh
- Z a4929362969af97c45531df857286989
 -Z 0057cd8fc280f2ed6a1015934452d1e9
++Z c02d09c2f2bfe5e823a2e301838383db
diff --cc manifest.uuid
index 070a84a61c3ac60613246f433b288408f72e7f7d,9a1e5a3e10d43969bbc6a6f1217daa6aa9909b21..64dc1693aea813f19ed8aea009dfb385373fe426
@@@ -1,1 -1,1 +1,1 @@@
- abc27b6023e28a717bfa15648ddc152bda9c7b96
 -696219b11049930cdbc38f574820f4bbaf8621bb
++36944be6be5c42096f5da84187ff203af26b08ae
diff --cc src/expr.c
Simple merge