*** pgsql.alvaro/src/backend/access/common/reloptions.c	2009-01-31 02:01:21.000000000 -0200
--- pgsql.euler/src/backend/access/common/reloptions.c	2009-01-31 02:16:29.000000000 -0200
***************
*** 487,492 ****
--- 487,519 ----
  	{
  		ReloptElem    *def = lfirst(cell);
  
+ 		/*
+ 		 * Error out if the namespace is not valid.  A NULL namespace
+ 		 * is always valid.
+ 		 */
+ 		if (def->nmspc != NULL)
+ 		{
+ 			bool	valid = false;
+ 			int		i;
+ 
+ 			if (validnsps)
+ 			{
+ 				for (i = 0; validnsps[i]; i++)
+ 				{
+ 					if (pg_strcasecmp(def->nmspc, validnsps[i]) == 0)
+ 					{
+ 						valid = true;
+ 						break;
+ 					}
+ 				}
+ 			}
+ 
+ 			if (!valid)
+ 				ereport(ERROR,
+ 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+ 						 errmsg("unrecognized parameter namespace \"%s\"",
+ 								def->nmspc)));
+ 		}
  
  		if (isReset)
  		{
***************
*** 501,534 ****
  			const char *value;
  			Size		len;
  
- 			/*
- 			 * Error out if the namespace is not valid.  A NULL namespace
- 			 * is always valid.
- 			 */
- 			if (def->nmspc != NULL)
- 			{
- 				bool	valid = false;
- 				int		i;
- 
- 				if (validnsps)
- 				{
- 					for (i = 0; validnsps[i]; i++)
- 					{
- 						if (pg_strcasecmp(def->nmspc, validnsps[i]) == 0)
- 						{
- 							valid = true;
- 							break;
- 						}
- 					}
- 				}
- 
- 				if (!valid)
- 					ereport(ERROR,
- 							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
- 							 errmsg("unrecognized parameter namespace \"%s\"",
- 									def->nmspc)));
- 			}
- 
  			if (ignoreOids && pg_strcasecmp(def->optname, "oids") == 0)
  				continue;
  
--- 528,533 ----