diff --git a/manifest b/manifest
index 8e532126f6..b3a7573de0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\stest\scase\sfor\sORDER\sBY\susing\sthe\secho\smodule.\s(CVS\s3237)
-D 2006-06-14T07:41:32
+C Add\stests\sfor\sthe\snew\sMATCH\soperator.\s(CVS\s3238)
+D 2006-06-14T08:48:26
 F Makefile.in 200f6dc376ecfd9b01e5359c4e0c10c02f649b34
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -192,7 +192,7 @@ F test/join5.test 2646825693a6e066ea89b498176d4a68df45ab68
 F test/journal1.test 36f2d1bb9bf03f790f43fbdb439e44c0657fab19
 F test/lastinsert.test 9d7241f562d7adcf61730de83176417d7e30d76b
 F test/laststmtchanges.test 19a6d0c11f7a31dc45465b495f7b845a62cbec17
-F test/like.test 1665284b66060934568e2b4a69ad4f9033ecb5dd
+F test/like.test 5f7d76574752a9101cac13372c8a85999d0d91e6
 F test/limit.test 71884068d47b18f614735f0686690319b32cdc22
 F test/lock.test 9b7afcb24f53d24da502abb33daaad2cd6d44107
 F test/lock2.test d83ba79d3c4fffdb5b926c7d8ca7a36c34288a55
@@ -288,7 +288,7 @@ F test/vacuum.test 37f998b841cb335397c26d9bbc3457182af2565f
 F test/vacuum2.test 5aea8c88a65cb29f7d175296e7c819c6158d838c
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/view.test 16e2774fe35e47a07ac4471b7f0bcc948b1aa6d5
-F test/vtab1.test 8f123ec98d9492528d2a1c41561f69d2ed8a4b9a
+F test/vtab1.test c74328129c2b6c3821c903b05dea8076fc362bf9
 F test/where.test ee7c9a6659b07e1ee61177f6e7ff71565ee2c9df
 F test/where2.test a16476a5913e75cf65b38f2daa6157a6b7791394
 F test/where3.test 3b5ad2c58069e12be2bd86bc5e211a82810521aa
@@ -364,7 +364,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 3ffa51b50a7831ef359bc40acf605decc922c498
-R a42bc0c303b9b85b83b5dd270a6f439d
+P f459f034f659a4c418aa1bc72135cc93d04565df
+R ea0e08f5993556739ac65af3b6ec4b97
 U danielk1977
-Z 1ff93a8928398e025b1675757469e123
+Z 19fda68a524896e3f72b47e2caafc4a8
diff --git a/manifest.uuid b/manifest.uuid
index 0c7856f57e..48170262a0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f459f034f659a4c418aa1bc72135cc93d04565df
\ No newline at end of file
+b4024c394d25e5a0abdb07be779ae41581834c42
\ No newline at end of file
diff --git a/test/like.test b/test/like.test
index 2575a2e07b..8efeb41617 100644
--- a/test/like.test
+++ b/test/like.test
@@ -13,7 +13,7 @@
 # in particular the optimizations that occur to help those operators
 # run faster.
 #
-# $Id: like.test,v 1.4 2006/01/17 09:35:02 danielk1977 Exp $
+# $Id: like.test,v 1.5 2006/06/14 08:48:26 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -114,6 +114,23 @@ do_test like-2.2 {
   }
 } {abc abcd}
 
+# Tests of the MATCH operator
+#
+do_test like-2.3 {
+  proc test_match {a b} {
+    return [string match $a $b]
+  }
+  db function match test_match
+  execsql {
+    SELECT x FROM t1 WHERE x MATCH '*abc*' ORDER BY 1;
+  }
+} {{ABC abc xyz} abc abcd}
+do_test like-2.4 {
+  execsql {
+    SELECT x FROM t1 WHERE x MATCH 'abc*' ORDER BY 1;
+  }
+} {abc abcd}
+
 # For the remaining tests, we need to have the like optimizations
 # enabled.
 #
diff --git a/test/vtab1.test b/test/vtab1.test
index 48196ffe6a..f521f23c33 100644
--- a/test/vtab1.test
+++ b/test/vtab1.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is creating and dropping virtual tables.
 #
-# $Id: vtab1.test,v 1.13 2006/06/14 07:41:32 danielk1977 Exp $
+# $Id: vtab1.test,v 1.14 2006/06/14 08:48:26 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -321,6 +321,38 @@ do_test vtab1-3.13 {
 } [list xBestIndex {SELECT rowid, * FROM 'treal' WHERE b >= ? AND b <= ?}      \
         xFilter    {SELECT rowid, * FROM 'treal' WHERE b >= ? AND b <= ?} 2 10 ]
 
+# Add a function for the MATCH operator. Everything always matches!
+proc test_match {lhs rhs} {
+  lappend ::echo_module MATCH $lhs $rhs
+  return 1
+}
+db function match test_match
+
+set echo_module ""
+do_test vtab1-3.12 {
+  set echo_module ""
+  execsql {
+    SELECT * FROM t1 WHERE a MATCH 'string';
+  }
+} {1 2 3 4 5 6}
+do_test vtab1-3.13 {
+  set echo_module
+} [list xBestIndex {SELECT rowid, * FROM 'treal'} \
+        xFilter    {SELECT rowid, * FROM 'treal'} \
+        MATCH string 1                            \
+        MATCH string 4                            \
+]
+do_test vtab1-3.14 {
+  set echo_module ""
+  execsql {
+    SELECT * FROM t1 WHERE b MATCH 'string';
+  }
+} {1 2 3 4 5 6}
+do_test vtab1-3.15 {
+  set echo_module
+} [list xBestIndex {SELECT rowid, * FROM 'treal' WHERE b MATCH ?}        \
+        xFilter    {SELECT rowid, * FROM 'treal' WHERE b MATCH ?} string ]
+
 #----------------------------------------------------------------------
 # Test case vtab1-3 test table scans and the echo module's 
 # xBestIndex/xFilter handling of ORDER BY clauses.