From 458f445629cf4102b760aff44a6de44aefc35e01 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Wed, 5 Jul 2017 07:42:32 +0100
Subject: [PATCH] MCOL-763 Remove dumpcat.pl

Dumpcat was trying to pull in Perl's MySQL DBD as a dependency in RPM
builds. For 1.1 this causes conflicts so we can't do this. There are
alternative tools in ColumnStore to do the same thing as dumpcat.pl and
the SQL files are still there which is what the support tool uses.
---
 cpackEngineRPM.cmake       |   1 -
 dbcon/mysql/CMakeLists.txt |   2 +-
 dbcon/mysql/dumpcat.pl     | 109 -------------------------------------
 3 files changed, 1 insertion(+), 111 deletions(-)
 delete mode 100755 dbcon/mysql/dumpcat.pl

diff --git a/cpackEngineRPM.cmake b/cpackEngineRPM.cmake
index 5f027a4e9..639f5e442 100644
--- a/cpackEngineRPM.cmake
+++ b/cpackEngineRPM.cmake
@@ -342,7 +342,6 @@ SET(CPACK_RPM_storage-engine_USER_FILELIST
 "/usr/local/mariadb/columnstore/mysql/install_calpont_mysql.sh"
 "/usr/local/mariadb/columnstore/mysql/syscatalog_mysql.sql"
 "/usr/local/mariadb/columnstore/mysql/dumpcat_mysql.sql"
-"/usr/local/mariadb/columnstore/mysql/dumpcat.pl"
 "/usr/local/mariadb/columnstore/mysql/calsetuserpriority.sql"
 "/usr/local/mariadb/columnstore/mysql/calremoveuserpriority.sql"
 "/usr/local/mariadb/columnstore/mysql/calshowprocesslist.sql"
diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index 015ad58ea..104e6bf6e 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -83,7 +83,7 @@ install(FILES syscatalog_mysql.sql
               columnstore_info.sql
               my.cnf
               DESTINATION ${ENGINE_MYSQLDIR} COMPONENT storage-engine)
-install(PROGRAMS install_calpont_mysql.sh mysql-Columnstore dumpcat.pl
+install(PROGRAMS install_calpont_mysql.sh mysql-Columnstore
               DESTINATION ${ENGINE_MYSQLDIR} COMPONENT storage-engine)
 
 
diff --git a/dbcon/mysql/dumpcat.pl b/dbcon/mysql/dumpcat.pl
deleted file mode 100755
index 9e63bc1c6..000000000
--- a/dbcon/mysql/dumpcat.pl
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/perl -w
-# $Id: dumpcat.pl 7049 2010-09-14 16:43:13Z rdempsey $
-#
-
-use DBI;
-use DBD::mysql;
-
-$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/mariadb/columnstore/mysql/my.cnf';
-$username = 'root';
-$auth = '';
-%attr = ();
-
-$dbh = DBI->connect($data_source, $username, $auth, \%attr);
-
-$stmt = <<EOD
-select
-        `schema`, tablename, columnname, objectid, dictobjectid, datatype,
-        scale, prec, columnlength, columnposition, compressiontype
-from
-        syscolumn
-order by
-        `schema`, tablename, columnposition;
-EOD
-;
-
-print "schema     tablename                 colname           objectid      dict  dt       scale   prec collen  pos  ct\n";
-print "------     ---------                 -------           --------  --------  -------- -----   ---- ------  ---  --\n";
-format STDOUT =
-@<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<< @>>>>>>   @>>>>>>  @<<<<<<< @>>>> @>>>>> @>>>>> @>>> @>>
-$schema, $tablename, $colname, $objectid, $dict, $dts, $scale, $prec, $collen, $pos, $ct
-.
-
-$sth = $dbh->prepare($stmt);
-$sth->execute();
-($schema, $tablename, $colname, $objectid, $dict, $dt, $scale, $prec, $collen, $pos, $ct) = $sth->fetchrow_array();
-while (defined($schema))
-{
-	$dict = '' if (!defined($dict));
-	if ($dt == 0)
-	{
-		$dts = 'bit';
-	}
-	elsif ($dt == 1)
-	{
-		$dts = 'tinyint';
-	}
-	elsif ($dt == 2)
-	{
-		$dts = 'char';
-	}
-	elsif ($dt == 3)
-	{
-		$dts = 'smallint';
-	}
-	elsif ($dt == 4)
-	{
-		$dts = 'decimal';
-	}
-	elsif ($dt == 5)
-	{
-		$dts = 'medint';
-	}
-	elsif ($dt == 6)
-	{
-		$dts = 'int';
-	}
-	elsif ($dt == 7)
-	{
-		$dts = 'float';
-	}
-	elsif ($dt == 8)
-	{
-		$dts = 'date';
-	}
-	elsif ($dt == 9)
-	{
-		$dts = 'bigint';
-	}
-	elsif ($dt == 10)
-	{
-		$dts = 'double';
-	}
-	elsif ($dt == 11)
-	{
-		$dts = 'datetime';
-	}
-	elsif ($dt == 12)
-	{
-		$dts = 'varchar';
-	}
-	elsif ($dt == 13)
-	{
-		$dts = 'clob';
-	}
-	elsif ($dt == 14)
-	{
-		$dts = 'blob';
-	}
-	else
-	{
-		$dts = "$dt";
-	}
-	#print "$schema\t$tablename\t$colname\t$objectid\t$dict\t$dt\t$scale\t$prec\t$collen\t$pos\t$ct\n";
-	write;
-	($schema, $tablename, $colname, $objectid, $dict, $dt, $scale, $prec, $collen, $pos, $ct) = $sth->fetchrow_array();
-}
-
-$dbh->disconnect;
-