Remove the "h2.MAX_MEMORY_ROWS_DISTINCT" system property to reduce confusion.

We already have the MAX_MEMORY_ROWS setting which does a very similar thing, and is better documented.

h2/src/main/org/h2/engine/DbSettings.java

@@ -156,16 +156,6 @@ public class DbSettings extends SettingsBase {
      */
     public final int maxCompactTime = get("MAX_COMPACT_TIME", 200);
 
-    /**
-     * Database setting <code>MAX_MEMORY_ROWS_DISTINCT</code> (default:
-     * 10000).<br />
-     * The maximum number of rows kept in-memory for SELECT DISTINCT queries. If
-     * more than this number of rows are in a result set, a temporary table is
-     * used.
-     */
-    public final int maxMemoryRowsDistinct = get("MAX_MEMORY_ROWS_DISTINCT",
-            10000);
-
     /**
      * Database setting <code>MAX_QUERY_TIMEOUT</code> (default: 0).<br />
      * The maximum timeout of a query in milliseconds. The default is 0, meaning

h2/src/main/org/h2/result/LocalResult.java

@@ -260,7 +260,7 @@ public class LocalResult implements ResultInterface, ResultTarget {
                 distinctRows.put(array, values);
                 rowCount = distinctRows.size();
                 Database db = session.getDatabase();
-                if (rowCount > db.getSettings().maxMemoryRowsDistinct &&
+                if (rowCount > db.getMaxMemoryRows() &&
                         db.isPersistent() && !db.isReadOnly()) {
                     external = new ResultTempTable(session, sort);
                     rowCount = external.addRows(distinctRows.values());

h2/src/test/org/h2/test/db/TestCases.java

@@ -53,7 +53,7 @@ public class TestCases extends TestBase {
         testDependencies();
         testConvertType();
         testSortedSelect();
-        testMaxMemoryRowsDistinct();
+        testMaxMemoryRows();
         testDeleteTop();
         testUnicode();
         testOuterJoin();
@@ -278,10 +278,10 @@ public class TestCases extends TestBase {
         conn.close();
     }
 
-    private void testMaxMemoryRowsDistinct() throws SQLException {
+    private void testMaxMemoryRows() throws SQLException {
         deleteDb("cases");
         Connection conn = getConnection(
-                "cases;max_memory_rows_distinct=1");
+                "cases;max_memory_rows=1");
         Statement stat = conn.createStatement();
         stat.execute("create table test(id int primary key)");
         stat.execute("insert into test values(1), (2)");

h2/src/test/org/h2/test/db/TestDeadlock.java

@@ -96,7 +96,7 @@ public class TestDeadlock extends TestBase {
 
     private void testConcurrentLobReadAndTempResultTableDelete() throws Exception {
         deleteDb("deadlock");
-        String url = "deadlock;MAX_MEMORY_ROWS_DISTINCT=10";
+        String url = "deadlock;MAX_MEMORY_ROWS=10";
         Connection conn, conn2;
         Statement stat2;
         conn = getConnection(url);

h2/src/test/org/h2/test/db/TestReadOnly.java

@@ -96,7 +96,7 @@ public class TestReadOnly extends TestBase {
         conn.close();
         conn = getConnection(
                 "readonlyTemp;ACCESS_MODE_DATA=r;" +
-                "MAX_MEMORY_ROWS_DISTINCT=10");
+                "MAX_MEMORY_ROWS=10");
         stat = conn.createStatement();
         stat.execute("SELECT DISTINCT ID FROM TEST");
         conn.close();

h2/src/test/org/h2/test/db/TestTempTables.java

@@ -98,7 +98,7 @@ public class TestTempTables extends TestBase {
     private void testTempTableResultSet() throws SQLException {
         deleteDb("tempTables");
         Connection conn = getConnection(
-                "tempTables;MAX_MEMORY_ROWS_DISTINCT=10");
+                "tempTables;MAX_MEMORY_ROWS=10");
         Statement stat1 = conn.createStatement(
                 ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
         Statement stat2 = conn.createStatement(