From 803716013dc1350f8cd97fdfca4bdffc9a52021c Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 8 Jul 2010 18:42:12 +0000
Subject: Install safeguard against running PL/Python 2 and 3 in the same
 session

---
 doc/src/sgml/plpython.sgml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index 3f924e6cbf1..c76012db402 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.50 2010/07/06 21:37:31 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.51 2010/07/08 18:42:12 petere Exp $ -->
 
 <chapter id="plpython">
  <title>PL/Python - Python Procedural Language</title>
@@ -154,12 +154,13 @@
   </para>
 
   <para>
-   On most (possibly all) platforms, it is not possible to use
-   PL/Python based on Python 2 and PL/Python based on Python 3 in the
-   same session, because the symbols in the dynamic modules will
-   clash, which will result in crashes of the PostgreSQL server
-   process.  It is possible, however, to use both PL/Python variants
-   in the same database, from separate sessions.
+   It is not allowed to use PL/Python based on Python 2 and PL/Python
+   based on Python 3 in the same session, because the symbols in the
+   dynamic modules would clash, which could result in crashes of the
+   PostgreSQL server process.  There is a check that prevents mixing
+   Python major versions in a session, which will abort the session if
+   a mismatch is detected.  It is possible, however, to use both
+   PL/Python variants in the same database, from separate sessions.
   </para>
  </sect1>
 
-- 
cgit v1.2.3