*** ./src/bin/psql/startup.c.orig	Mon Nov 19 13:06:15 2001
--- ./src/bin/psql/startup.c	Tue Nov 20 09:08:44 2001
***************
*** 293,298 ****
--- 293,319 ----
  #endif
  		}
  
+ 	
+ /* Warn if connecting to a different version */
+ 		PGresult   *result;
+ 		bool echo=false;
+ 
+ 		/* Temporarily turn off echoing */
+ 		if (GetVariable(pset.vars, "ECHO_HIDDEN")) {
+ 			DeleteVariable(pset.vars, "ECHO_HIDDEN");
+ 			echo = true;
+ 		}
+ 		result = PSQLexec("SELECT version()");
+ 		if (echo)
+ 			SetVariableBool(pset.vars, "ECHO_HIDDEN");
+ 		if (result) {
+ 			char serverversion[12];
+ 			sscanf(PQgetvalue(result,0,0), "PostgreSQL %s", serverversion);
+ 			PQclear(result);
+ 			if (strcmp(PG_VERSION, serverversion))
+ 				printf("WARNING! psql version %s does not match server version %s!\n\n", PG_VERSION, serverversion);
+ 		}
+ 				
  		SetVariable(pset.vars, "PROMPT1", DEFAULT_PROMPT1);
  		SetVariable(pset.vars, "PROMPT2", DEFAULT_PROMPT2);
  		SetVariable(pset.vars, "PROMPT3", DEFAULT_PROMPT3);