Arrang stable15 with changes in the core. Also, one small bugfix in tests.

Author: danolivo

aqo.c

@@ -420,7 +420,7 @@ _PG_init(void)
 							"Set how many neighbors the cardinality prediction will be calculated",
 							NULL,
 							&aqo_k,
-							1, INT_MAX / 1000,
+							3, 1, INT_MAX / 1000,
 							PGC_USERSET,
 							0,
 							NULL,

expected/plancache.out

@@ -45,8 +45,8 @@ SELECT * FROM f1();
 DROP FUNCTION f1;
 DROP TABLE test CASCADE;
 SELECT true FROM aqo_reset();
- bool 
-------
+ ?column? 
+----------
  t
 (1 row)