*** pgsql/src/backend/utils/adt/regexp.c	2008/03/19 02:40:37	1.79
--- pgsql/src/backend/utils/adt/regexp.c	2008/04/02 14:42:56	1.80
***************
*** 8,14 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.78 2008/01/01 19:45:52 momjian Exp $
   *
   *		Alistair Crooks added the code for the regex caching
   *		agc - cached the regular expressions used - there's a good chance
--- 8,14 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.79 2008/03/19 02:40:37 tgl Exp $
   *
   *		Alistair Crooks added the code for the regex caching
   *		agc - cached the regular expressions used - there's a good chance
***************
*** 40,46 ****
  
  
  /* GUC-settable flavor parameter */
! static int	regex_flavor = REG_ADVANCED;
  
  
  /* all the options of interest for regex functions */
--- 40,46 ----
  
  
  /* GUC-settable flavor parameter */
! int	regex_flavor = REG_ADVANCED;
  
  
  /* all the options of interest for regex functions */
*************** parse_re_flags(pg_re_flags *flags, text
*** 414,446 ****
  }
  
  
- /*
-  * assign_regex_flavor - GUC hook to validate and set REGEX_FLAVOR
-  */
- const char *
- assign_regex_flavor(const char *value, bool doit, GucSource source)
- {
- 	if (pg_strcasecmp(value, "advanced") == 0)
- 	{
- 		if (doit)
- 			regex_flavor = REG_ADVANCED;
- 	}
- 	else if (pg_strcasecmp(value, "extended") == 0)
- 	{
- 		if (doit)
- 			regex_flavor = REG_EXTENDED;
- 	}
- 	else if (pg_strcasecmp(value, "basic") == 0)
- 	{
- 		if (doit)
- 			regex_flavor = REG_BASIC;
- 	}
- 	else
- 		return NULL;			/* fail */
- 	return value;				/* OK */
- }
- 
- 
  /*
   * report whether regex_flavor is currently BASIC
   */
--- 414,419 ----