Some places in the code were not respecting the value set in the "SET MAX_MEMORY_ROWS x" command

h2/src/docsrc/html/changelog.html

@@ -35,7 +35,8 @@ Change Log
 </li><li>Issue 581: When running in LOCK_MODE=0,
         JdbcDatabaseMetaData#supportsTransactionIsolationLevel(TRANSACTION_READ_UNCOMMITTED)
     should return false
-</li><li>Fix bug which could generate deadlocks when multiple connections accessed the same table.    
+</li><li>Fix bug which could generate deadlocks when multiple connections accessed the same table.
+</li><li>Some places in the code were not respecting the value set in the "SET MAX_MEMORY_ROWS x" command    
 </li></ul>
 
 <h2>Version 1.4.182 Beta (2014-10-17)</h2>

h2/src/main/org/h2/mvstore/db/MVTable.java

@@ -494,7 +494,7 @@ public class MVTable extends TableBase {
         long i = 0;
         Store store = session.getDatabase().getMvStore();
 
-        int bufferSize = SysProperties.MAX_MEMORY_ROWS / 2;
+        int bufferSize = database.getMaxMemoryRows() / 2;
         ArrayList<Row> buffer = New.arrayList(bufferSize);
         String n = getName() + ":" + index.getName();
         int t = MathUtils.convertLongToInt(total);
@@ -535,7 +535,7 @@ public class MVTable extends TableBase {
         long total = remaining;
         Cursor cursor = scan.find(session, null, null);
         long i = 0;
-        int bufferSize = (int) Math.min(total, SysProperties.MAX_MEMORY_ROWS);
+        int bufferSize = (int) Math.min(total, database.getMaxMemoryRows());
         ArrayList<Row> buffer = New.arrayList(bufferSize);
         String n = getName() + ":" + index.getName();
         int t = MathUtils.convertLongToInt(total);

h2/src/main/org/h2/table/RegularTable.java

@@ -264,7 +264,7 @@ public class RegularTable extends TableBase {
                 long total = remaining;
                 Cursor cursor = scan.find(session, null, null);
                 long i = 0;
-                int bufferSize = (int) Math.min(rowCount, SysProperties.MAX_MEMORY_ROWS);
+                int bufferSize = (int) Math.min(rowCount, database.getMaxMemoryRows());
                 ArrayList<Row> buffer = New.arrayList(bufferSize);
                 String n = getName() + ":" + index.getName();
                 int t = MathUtils.convertLongToInt(total);