Commitcfe443a

committed

In pg_upgrade, when checking for the plpython library, we must check for

"plpython2" when upgrading from pre-PG 9.1. Patch to head and 9.1.Per report from Peter.

1 parentb95aec5 commitcfe443aCopy full SHA for cfe443a

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,24 @@ check_loadable_libraries(void)`
`228`	`228`	`charcmd= (char)pg_malloc(8+2*llen+1);`
`229`	`229`	`PGresult*res;`
`230`	`230`
	`231`	`+/*`
	`232`	`+ *In Postgres 9.0, Python 3 support was added, and to do that, a`
	`233`	`+ *plpython2u language was created with library name plpython2.so`
	`234`	`+ *as a symbolic link to plpython.so. In Postgres 9.1, only the`
	`235`	`+ *plpython2.so library was created, and both plpythonu and`
	`236`	`+ *plpython2u pointing to it. For this reason, any reference to`
	`237`	`+ *library name "plpython" in an old PG <= 9.1 cluster must look`
	`238`	`+ *for "plpython2" in the new cluster.`
	`239`	`+ */`
	`240`	`+if (GET_MAJOR_VERSION(old_cluster.major_version)<901&&`
	`241`	`+strcmp(lib,"$libdir/plpython")==0)`
	`242`	`+{`
	`243`	`+lib="$libdir/plpython2";`
	`244`	`+llen=strlen(lib);`
	`245`	`+}`
	`246`	`+`
`231`	`247`	`strcpy(cmd,"LOAD '");`
`232`		`-PQescapeStringConn(conn,cmd+6,lib,llen,NULL);`
	`248`	`+PQescapeStringConn(conn,cmd+strlen(cmd),lib,llen,NULL);`
`233`	`249`	`strcat(cmd,"'");`
`234`	`250`
`235`	`251`	`res=PQexec(conn,cmd);`

Comments

(0)