From 23c54f05359d943dec658f9d223f31673cd6de9b Mon Sep 17 00:00:00 2001
From: Marko Kreen
Date: Fri, 3 Feb 2012 17:23:38 +0200
Subject: Drop all txid install code.

It's obsolete since 8.3.  Drop it.
---
 python/pgq/cascade/admin.py           | 2 +-
 python/pgqadm.py                      | 2 +-
 python/qadmin.py                      | 2 +-
 sql/londiste/sql/londiste_install.sql | 2 +-
 sql/pgq/sql/pgq_init.sql              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py
index 964af081..517cac21 100644
--- a/python/pgq/cascade/admin.py
+++ b/python/pgq/cascade/admin.py
@@ -318,7 +318,7 @@ class CascadeAdmin(skytools.AdminScript):
         """Install cascading code to db."""
         objs = [
             skytools.DBLanguage("plpgsql"),
-            skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
+            #skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
             skytools.DBSchema("pgq", sql_file="pgq.sql"),
             skytools.DBFunction("pgq.get_batch_cursor", 3, sql_file = "pgq.upgrade.2to3.sql"),
             skytools.DBSchema("pgq_ext", sql_file="pgq_ext.sql"), # not needed actually
diff --git a/python/pgqadm.py b/python/pgqadm.py
index 7fdfdc3b..32591250 100755
--- a/python/pgqadm.py
+++ b/python/pgqadm.py
@@ -131,7 +131,7 @@ class PGQAdmin(skytools.DBScript):
     def installer(self):
         objs = [
             skytools.DBLanguage("plpgsql"),
-            skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
+            #skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
             skytools.DBSchema("pgq", sql_file="pgq.sql"),
         ]
 
diff --git a/python/qadmin.py b/python/qadmin.py
index 608de5cd..839b3a35 100755
--- a/python/qadmin.py
+++ b/python/qadmin.py
@@ -1112,7 +1112,7 @@ class AdminConsole:
     def cmd_install(self, params):
         pgq_objs = [
             skytools.DBLanguage("plpgsql"),
-            skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
+            #skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
             skytools.DBSchema("pgq", sql_file="pgq.sql"),
             skytools.DBSchema("pgq_ext", sql_file="pgq_ext.sql"),
             skytools.DBSchema("pgq_node", sql_file="pgq_node.sql"),
diff --git a/sql/londiste/sql/londiste_install.sql b/sql/londiste/sql/londiste_install.sql
index 20b0987f..c11550cf 100644
--- a/sql/londiste/sql/londiste_install.sql
+++ b/sql/londiste/sql/londiste_install.sql
@@ -5,7 +5,7 @@ set client_min_messages = 'fatal';
 create language plpgsql;
 set client_min_messages = 'warning';
 
-\i ../txid/txid.sql
+-- \i ../txid/txid.sql
 \i ../pgq/pgq.sql
 \i ../pgq_node/pgq_node.sql
 
diff --git a/sql/pgq/sql/pgq_init.sql b/sql/pgq/sql/pgq_init.sql
index d14cf6ef..18a6344b 100644
--- a/sql/pgq/sql/pgq_init.sql
+++ b/sql/pgq/sql/pgq_init.sql
@@ -1,6 +1,6 @@
 
 \set ECHO none
-\i ../txid/txid.sql
+-- \i ../txid/txid.sql
 -- \i pgq.sql
 \i structure/install.sql
 
-- 
cgit v1.2.3