From 86fc3b01f4867e28b58c07e2f86506f0549e3587 Mon Sep 17 00:00:00 2001
From: Yehonal <yehonal.azeroth@gmail.com>
Date: Sat, 13 Aug 2016 20:22:49 +0200
Subject: [PATCH] minor updates to mysql-tools

---
 modules/uwd/mysql-tools/.gitignore        |  26 ++---
 modules/uwd/mysql-tools/bin/dump-parser   | Bin
 modules/uwd/mysql-tools/mysql-config.dist | 124 +++++++++++-----------
 modules/uwd/mysql-tools/upt.json          |  11 --
 4 files changed, 75 insertions(+), 86 deletions(-)
 mode change 100644 => 100755 modules/uwd/mysql-tools/bin/dump-parser
 delete mode 100644 modules/uwd/mysql-tools/upt.json

diff --git a/modules/uwd/mysql-tools/.gitignore b/modules/uwd/mysql-tools/.gitignore
index c6659cf0c..fa1ea4671 100644
--- a/modules/uwd/mysql-tools/.gitignore
+++ b/modules/uwd/mysql-tools/.gitignore
@@ -1,13 +1,13 @@
-/mysql_config
-mysql_tools_(for usr-local-bin)
-
-#
-# Editors / debuggers / other output files
-#
-*~
-*.bak
-*.orig
-*.patch
-callgrind.out.*
-
-.upt.json
+/mysql_config
+mysql_tools_(for usr-local-bin)
+
+#
+# Editors / debuggers / other output files
+#
+*~
+*.bak
+*.orig
+*.patch
+callgrind.out.*
+
+.upt.json
diff --git a/modules/uwd/mysql-tools/bin/dump-parser b/modules/uwd/mysql-tools/bin/dump-parser
old mode 100644
new mode 100755
diff --git a/modules/uwd/mysql-tools/mysql-config.dist b/modules/uwd/mysql-tools/mysql-config.dist
index 2075c54c1..ca71fc41e 100644
--- a/modules/uwd/mysql-tools/mysql-config.dist
+++ b/modules/uwd/mysql-tools/mysql-config.dist
@@ -1,62 +1,62 @@
-#!/bin/bash
-#
-# * Copyright (C) 2007 - 2015 Hyperweb2 All rights reserved.
-# * GNU General Public License version 3; see www.hyperweb2.com/terms/
-#
-# This file contains login/password information for accessing the MySQL database
-# and is used by all the mysql_* scripts.
-#
-
-#
-#	MYSQL
-#
-
-# change these lines with your mysql config
-MYSQL_DB=test
-MYSQL_USER=usr
-MYSQL_PASS=pwd
-MYSQL_HOST=localhost
-#MYSQL_SOCK=/var/lib/mysql/mysql.sock
-
-#
-#	File Options
-#
-
-# path of directory where extract separated tables ( without end slash )
-TPATH=./tables
-
-# (boolean) clean directory before dump, in this way non-existant db tables will be deleted
-CLEANFOLDER=1
-
-# path of file to extract database full dump
-FPATH=./full/full.sql
-
-# (boolean) switch to enable(1)/disable(0) the dump/import of full db file
-# ( you can do it manually using command parameters )
-FULL=0
-
-# (boolean) set 1 to enable --tab option for mysqldump and import data from it
-# it's very fast import/export process but doesn't utilize the insert query
-# NOTE: full db continue to be dumped with normal sql format
-# NOTE2: if you have problem with permissions ( mysql errorcode:13) mostly in linux
-# you should enable CHMODE config and disable/edit
-# some protections such as AppArmor in Ubuntu or SELinux in Fedora..
-
-TEXTDUMPS=1
-
-# (boolean) allow to change "TPATH" folder permissions to enable mysql server writing
-
-CHMODE=0
-
-
-#
-# TOOLS OPTIONS
-#
-
-#number of threads you want to use in TEXT import mode ( you can safely set it to your number of processor increasing process speed )
-THREADS=1
-
-IMPORTOPTS_TEXT="--use-threads=$THREADS --local --compress --delete --lock-tables"
-
-DUMPOPTS="--skip-comments --skip-set-charset --extended-insert --order-by-primary --single-transaction --quick"
-
+#!/bin/bash
+#
+# * Copyright (C) 2007 - 2015 Hyperweb2 All rights reserved.
+# * GNU General Public License version 3; see www.hyperweb2.com/terms/
+#
+# This file contains login/password information for accessing the MySQL database
+# and is used by all the mysql_* scripts.
+#
+
+#
+#	MYSQL
+#
+
+# change these lines with your mysql config
+MYSQL_DB=test
+MYSQL_USER=usr
+MYSQL_PASS=pwd
+MYSQL_HOST=localhost
+#MYSQL_SOCK=/var/lib/mysql/mysql.sock
+
+#
+#	File Options
+#
+
+# path of directory where extract separated tables ( without end slash )
+TPATH=./tables
+
+# (boolean) clean directory before dump, in this way non-existant db tables will be deleted
+CLEANFOLDER=1
+
+# path of file to extract database full dump
+FPATH=./full/full.sql
+
+# (boolean) switch to enable(1)/disable(0) the dump/import of full db file
+# ( you can do it manually using command parameters )
+FULL=0
+
+# (boolean) set 1 to enable --tab option for mysqldump and import data from it
+# it's very fast import/export process but doesn't utilize the insert query
+# NOTE: full db continue to be dumped with normal sql format
+# NOTE2: if you have problem with permissions ( mysql errorcode:13) mostly in linux
+# you should enable CHMODE config and disable/edit
+# some protections such as AppArmor in Ubuntu or SELinux in Fedora..
+
+TEXTDUMPS=1
+
+# (boolean) allow to change "TPATH" folder permissions to enable mysql server writing
+
+CHMODE=0
+
+
+#
+# TOOLS OPTIONS
+#
+
+#number of threads you want to use in TEXT import mode ( you can safely set it to your number of processor increasing process speed )
+THREADS=1
+
+IMPORTOPTS_TEXT="--use-threads=$THREADS --local --compress --delete --lock-tables"
+
+DUMPOPTS="--skip-comments --skip-set-charset --extended-insert --order-by-primary --single-transaction --quick"
+
diff --git a/modules/uwd/mysql-tools/upt.json b/modules/uwd/mysql-tools/upt.json
deleted file mode 100644
index 2956a94a2..000000000
--- a/modules/uwd/mysql-tools/upt.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "name": "udw/mysql-tools",
-    "dependencies": {
-    },
-    "devDependencies": {
-    },
-    "_comment_keep": "ensure we keep the right git repository configurations",
-    "keep": [
-        ".git/config"
-    ]
-}