@@ -204,6 +204,7 @@ nextval (struct varlena * seqin)
204204
205205/* open and WIntentLock sequence */
206206elm = init_sequence ("nextval" ,seqname );
207+ pfree (seqname );
207208
208209if (elm -> last != elm -> cached )/* some numbers were cached */
209210 {
@@ -237,7 +238,7 @@ nextval (struct varlena * seqin)
237238break ;/* stop caching */
238239if (seq -> is_cycled != 't' )
239240elog (WARN ,"%s.nextval: got MAXVALUE (%d)" ,
240- seqname ,maxv );
241+ elm -> name ,maxv );
241242next = minv ;
242243 }
243244else
@@ -252,7 +253,7 @@ nextval (struct varlena * seqin)
252253break ;/* stop caching */
253254if (seq -> is_cycled != 't' )
254255elog (WARN ,"%s.nextval: got MINVALUE (%d)" ,
255- seqname ,minv );
256+ elm -> name ,minv );
256257next = maxv ;
257258 }
258259else
@@ -287,34 +288,19 @@ currval (struct varlena * seqin)
287288{
288289char * seqname = textout (seqin );
289290SeqTable elm ;
290- Buffer buf ;
291- SequenceTupleForm seq ;
292- ItemPointerData iptr ;
293291int4 result ;
294292
295293/* open and WIntentLock sequence */
296294elm = init_sequence ("currval" ,seqname );
295+ pfree (seqname );
297296
298- if (elm -> last != elm -> cached )/*some numbers werecached */
297+ if (elm -> increment == 0 )/*nextval/read_info werenot called */
299298 {
300- return ( elm -> last ); /* return last returned by nextval */
299+ elog ( WARN , "%s.currval is not yet defined in this session" , elm -> name );
301300 }
302301
303- seq = read_info ("currval" ,elm ,& buf );
304-
305- if (seq -> is_called != 't' )
306- {
307- elog (WARN ,"%s.currval: yet undefined (%s.nextval never called)" ,
308- seqname ,seqname );
309- }
310- result = seq -> last_value ;
302+ result = elm -> last ;
311303
312- if (ReleaseBuffer (buf )== STATUS_ERROR )
313- elog (WARN ,"%s.currval: ReleaseBuffer failed" ,seqname );
314-
315- ItemPointerSet (& iptr ,0 ,FirstOffsetNumber );
316- RelationUnsetSingleWLockPage (elm -> rel ,& iptr );
317-
318304return (result );
319305
320306}