From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Sat, 5 Oct 2013 15:52:55 +0000 (+0200)
Subject: Remove traces of mysqlbackend
X-Git-Tag: rec-3.6.0-rc1~412^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1c02139295f5ec893cbe024b056ec42c33f9065;p=pdns

Remove traces of mysqlbackend
---

diff --git a/README.md b/README.md
index 45f57c3f6..f4e44c1ba 100644
--- a/README.md
+++ b/README.md
@@ -50,9 +50,6 @@ To add multiple modules, try:
 
 See http://doc.powerdns.com/compiling-powerdns.html for more details.
 
-Please don't use the 'mysql' backend, it is deprecated. Use the 'gmysql'
-one!
-
 COMPILING THE RECURSOR
 ----------------------
 Either use ./configure --enable-recursor or explicitly do 'make pdns_recursor'. Releases
diff --git a/debian-pdns/shlibs.local b/debian-pdns/shlibs.local
index 8673b960a..a2ae88ae1 100644
--- a/debian-pdns/shlibs.local
+++ b/debian-pdns/shlibs.local
@@ -1,2 +1 @@
-libmysqlbackend 0
 libbindbackend 0
diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index be5925443..8fa0debc4 100755
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -12032,7 +12032,7 @@ local0.err                        /var/log/pdns.err
 	keep slave zones as slaves, and not convert them to native operation. 
       </para>
       <para>
-	By default, zone2sql outputs code suitable for the mysqlbackend, but it can also generate SQL for the Generic PostgreSQL, Generic MySQL and 
+	zone2sql can generate SQL for the Generic PostgreSQL, Generic MySQL and
 	Oracle backends. 
 	The following commands are available:
       </para>
@@ -12074,14 +12074,6 @@ local0.err                        /var/log/pdns.err
 	      </para>
 	    </listitem>
 	  </varlistentry>
-	  <varlistentry>
-	    <term>--mysql</term>
-	    <listitem>
-	      <para>
-		Output in format suitable for the default configuration of the MySQL backend. Default.
-	      </para>
-	    </listitem>
-	  </varlistentry>
 	  <varlistentry>
 	    <term>--named-conf=...</term>
 	    <listitem>
diff --git a/pdns/docs/zone2sql.8 b/pdns/docs/zone2sql.8
index 0f4432eff..8f4bf4869 100644
--- a/pdns/docs/zone2sql.8
+++ b/pdns/docs/zone2sql.8
@@ -10,12 +10,11 @@ on standard out, which can then be fed to your database.
 \fBzone2sql\fR understands the Bind master file extension '$GENERATE' and will
 also honour '$ORIGIN' and '$TTL'.
 .PP
-For backends supporting slave operation (currently only the PostgreSQL
-backend), there is also an option to keep slave zones as slaves, and not
-convert them to native operation.
+For backends supporting slave operation there is also an option to keep slave
+zones as slaves, and not convert them to native operation.
 .PP
-By default, zone2sql outputs code suitable for the mysqlbackend, but it can
-also generate SQL for the Generic PostgreSQL and Oracle backends.
+zone2sql can generate SQL for the Generic MySQL, Generic PostgreSQL and Oracle
+backends.
 .SH OPTIONS
 Input options:
 .TP
@@ -48,10 +47,6 @@ backend.
 Output in format suitable for the default configuration of the Generic
 PostgreSQL backend.
 .TP
-.B \-\-mysql
-Output in format suitable for the default configuration of the MySQL backend
-(the default output format).
-.TP
 .B \-\-oracle
 Output in format suitable for the default configuration of the Generic Oracle
 backend.