From 1a342a4a73fa77abd61064f11893041ed38f61f1 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 16 Mar 2012 17:00:49 +0000 Subject: [PATCH] Update the trace2.test script for languageid. FossilOrigin-Name: a11528ac575fa20fd8022756d042a32fe1272e12 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/trace2.test | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 4f001824a3..c4d9e8ea38 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Cherrypick\sthe\s[3475092cff]\sfix\sfor\s32-bit\soverflow\swith\slarge\slanguage-ids\ninto\strunk. -D 2012-03-16T16:52:54.032 +C Update\sthe\strace2.test\sscript\sfor\slanguageid. +D 2012-03-16T17:00:49.764 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -855,7 +855,7 @@ F test/tkt3997.test a335fa41ca3985660a139df7b734a26ef53284bd F test/tkt4018.test 7c2c9ba4df489c676a0a7a0e809a1fb9b2185bd1 F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7 F test/trace.test 4b36a41a3e9c7842151af6da5998f5080cdad9e5 -F test/trace2.test 962175290996d5f06dc4402ca218bbfc7df4cb20 +F test/trace2.test 37c3a05701e7f133ebdf078a61aa9479a23a73b0 F test/trans.test 6e1b4c6a42dba31bd65f8fa5e61a2708e08ddde6 F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22 F test/trans3.test 373ac5183cc56be69f48ae44090e7f672939f732 @@ -992,7 +992,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P 74eadeec34c4b19cf5f8b7f648db3b7ad601a00e -R da59c6040c440e1d087c29c77d94171a +P 2755edc7f1186ba8955f2c3550a90f40a55ddae2 +R ec577cf791cfb44b791ae9dc3e0f7343 U drh -Z 86f53efe49c877ef67da98d4e974121b +Z d80fb6c4fb859b25e151c85bda23f682 diff --git a/manifest.uuid b/manifest.uuid index 3b6c5ce27f..8412294df1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2755edc7f1186ba8955f2c3550a90f40a55ddae2 \ No newline at end of file +a11528ac575fa20fd8022756d042a32fe1272e12 \ No newline at end of file diff --git a/test/trace2.test b/test/trace2.test index 42738db3aa..0e3130ec00 100644 --- a/test/trace2.test +++ b/test/trace2.test @@ -141,6 +141,7 @@ ifcapable fts3 { INSERT INTO x1(x1) VALUES('optimize'); } { "INSERT INTO x1(x1) VALUES('optimize');" + "-- SELECT DISTINCT level / (1024 * ?) FROM 'main'.'x1_segdir'" "-- SELECT idx, start_block, leaves_end_block, end_block, root FROM 'main'.'x1_segdir' WHERE level BETWEEN ? AND ?ORDER BY level DESC, idx ASC" "-- SELECT max(level) FROM 'main'.'x1_segdir' WHERE level BETWEEN ? AND ?" "-- SELECT coalesce((SELECT max(blockid) FROM 'main'.'x1_segments') + 1, 1)" -- 2.47.2