From: mistachkin <mistachkin@noemail.net>
Date: Fri, 26 Aug 2016 04:32:59 +0000 (+0000)
Subject: Rename a test procedure in 'speed3.test' to avoid a name collision.
X-Git-Tag: version-3.15.0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e16b2d3e675663b3282f4dfcdf7aea0debb8e78;p=thirdparty%2Fsqlite.git

Rename a test procedure in 'speed3.test' to avoid a name collision.

FossilOrigin-Name: 84de17bc688f1df2be1a34420470d1b16f8f4e56
---

diff --git a/manifest b/manifest
index ec927214e4..62a14c34f4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adapt\sthe\sspecial\scase\sof\s'$'\sin\sitem\snames\sfor\stest\s'vtabH-3.1'\sas\swell.
-D 2016-08-26T02:10:50.317
+C Rename\sa\stest\sprocedure\sin\s'speed3.test'\sto\savoid\sa\sname\scollision.
+D 2016-08-26T04:32:59.825
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@ -1094,7 +1094,7 @@ F test/speed1.test f2974a91d79f58507ada01864c0e323093065452
 F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
 F test/speed1p.test b180e98609c7677382cf618c0ec9b69f789033a8
 F test/speed2.test 53177056baf6556dcbdcf032bbdfc41c1aa74ded
-F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523
+F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
@@ -1511,7 +1511,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 328f79bb5713abbecaeb0ef3fb37f56a0946b915
-R dade750024fe6ad04559f56926a096ca
+P e4aeaa2bc73b57f1ef134cc4f54e2a652a20b5c9
+R 66a24ec1ff987ca240e2459c8e68c102
 U mistachkin
-Z 8b0930f7f9116d652fcf85daf416c55f
+Z c2fe0f98a34be9a6c1038d1c5b4a377d
diff --git a/manifest.uuid b/manifest.uuid
index 89b707eee1..24ef17190b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4aeaa2bc73b57f1ef134cc4f54e2a652a20b5c9
\ No newline at end of file
+84de17bc688f1df2be1a34420470d1b16f8f4e56
\ No newline at end of file
diff --git a/test/speed3.test b/test/speed3.test
index 1beaeb74f3..4aa90943ba 100644
--- a/test/speed3.test
+++ b/test/speed3.test
@@ -105,7 +105,7 @@ proc io_log {db} {
   puts "Normal    : Read $stats2(read), wrote $stats2(write)"
 }
 
-proc reset_db {} {
+proc speed3_reset_db {} {
   db close
   sqlite3 db test.db
   db eval { 
@@ -117,7 +117,7 @@ proc reset_db {} {
 }
 
 forcedelete test2.db test2.db-journal
-reset_db
+speed3_reset_db
 
 # Set up a database in auto-vacuum mode and create a database schema.
 #
@@ -154,7 +154,7 @@ do_test speed3-0.4 {
 # Delete all content in a table, one row at a time.
 #
 #io_log db
-reset_db
+speed3_reset_db
 speed_trial speed3-1.incrvacuum $::NROW row {DELETE FROM main.t1 WHERE 1}
 speed_trial speed3-1.normal     $::NROW row {DELETE FROM aux.t1 WHERE 1}
 io_log db
@@ -164,7 +164,7 @@ io_log db
 #
 #db eval {PRAGMA incremental_vacuum(500000)}
 populate_t1 db
-reset_db
+speed3_reset_db
 speed_trial speed3-2.incrvacuum $::NROW row {SELECT c FROM main.t1}
 speed_trial speed3-2.normal     $::NROW row {SELECT c FROM aux.t1}
 io_log db