1 files changed, 23 insertions, 0 deletions
diff --git a/jstests/core/index/geo/geo_regex0.js b/jstests/core/index/geo/geo_regex0.js
new file mode 100644
index 00000000000..7629c193ea2
--- /dev/null
+++ b/jstests/core/index/geo/geo_regex0.js
@@ -0,0 +1,23 @@
+// From SERVER-2247
+// Tests to make sure regex works with geo indices
+
+t = db.regex0;
+t.drop();
+
+t.createIndex({point: '2d', words: 1});
+t.insert({point: [1, 1], words: ['foo', 'bar']});
+
+regex = {
+    words: /^f/
+};
+geo = {
+    point: {$near: [1, 1]}
+};
+both = {
+    point: {$near: [1, 1]},
+    words: /^f/
+};
+
+assert.eq(1, t.find(regex).count());
+assert.eq(1, t.find(geo).count());
+assert.eq(1, t.find(both).count());