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

Author: danolivo

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)
 

expected/statement_timeout.out

@@ -91,7 +91,7 @@ ERROR:  canceling statement due to statement timeout
 SELECT check_estimated_rows('SELECT *, pg_sleep(1) FROM t;');
  check_estimated_rows 
 ----------------------
-                    2
+                    4
 (1 row)
 
 SET statement_timeout = 800;