postgres
diff --git a/‎src/backend/utils/adt/pgstatfuncs.c
Copy file name to clipboardExpand all lines: src/backend/utils/adt/pgstatfuncs.c
+7-1Lines changed: 7 additions & 1 deletion b/‎src/backend/utils/adt/pgstatfuncs.c
Copy file name to clipboardExpand all lines: src/backend/utils/adt/pgstatfuncs.c
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/test/regress/expected/stats.out
Copy file name to clipboardExpand all lines: src/test/regress/expected/stats.out
+6Lines changed: 6 additions & 0 deletions b/‎src/test/regress/expected/stats.out
Copy file name to clipboardExpand all lines: src/test/regress/expected/stats.out
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/test/regress/sql/stats.sql
Copy file name to clipboardExpand all lines: src/test/regress/sql/stats.sql
+1Lines changed: 1 addition & 0 deletions b/‎src/test/regress/sql/stats.sql
Copy file name to clipboardExpand all lines: src/test/regress/sql/stats.sql
+1Lines changed: 1 addition & 0 deletions
@@ -56,12 +56,18 @@ Datum
 pg_stat_get_lastscan(PG_FUNCTION_ARGS)
 {
 	Oid			relid = PG_GETARG_OID(0);
+	TimestampTz result;
 	PgStat_StatTabEntry *tabentry;
 
 	if ((tabentry = pgstat_fetch_stat_tabentry(relid)) == NULL)
+		result = 0;
+	else
+		result = tabentry->lastscan;
+
+	if (result == 0)
 		PG_RETURN_NULL();
 	else
-		PG_RETURN_TIMESTAMPTZ(tabentry->lastscan);
+		PG_RETURN_TIMESTAMPTZ(result);
 }
 
 
 
@@ -573,6 +573,12 @@ SELECT pg_stat_force_next_flush();
 
 (1 row)
 
+SELECT last_seq_scan, last_idx_scan FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
+ last_seq_scan | last_idx_scan 
+---------------+---------------
+               | 
+(1 row)
+
 COMMIT;
 SELECT pg_stat_reset_single_table_counters('test_last_scan'::regclass);
  pg_stat_reset_single_table_counters 
 
@@ -303,6 +303,7 @@ BEGIN;
 CREATE TEMPORARY TABLE test_last_scan(idx_col int primary key, noidx_col int);
 INSERT INTO test_last_scan(idx_col, noidx_col) VALUES(1, 1);
 SELECT pg_stat_force_next_flush();
+SELECT last_seq_scan, last_idx_scan FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
 COMMIT;
 
 SELECT pg_stat_reset_single_table_counters('test_last_scan'::regclass);