fix error touch: cannot touch

fix error touch: cannot touch '/var/backups/mysql/2017.02.11/bd_name/error.log': No such file or directory

README.md

@@ -101,7 +101,7 @@ Options:
 
 Examples:
         backup.sh --verbose --compress=
-        backup.sh --verbose --compress=zgip
+        backup.sh --verbose --compress=gzip
         backup.sh --verbose --compress=bzip2
         backup.sh --verbose --compress= --exclude="mysql"
         backup.sh --verbose --compress= --exclude="mysql" --lifetime="3 day ago"

backup.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# === CONFIG ===
 VERBOSE=0
 COMPRESS='bzip2'
 USER='mysql'
@@ -17,6 +18,13 @@ if [ ! -n "$BASH" ] ;then echo Please run this script $0 with bash; exit 1; fi
 # === FUNCTION ===
 f_log()
 {
+    local bold=$(tput bold)
+    local yellow=$(tput setf 6)
+    local red=$(tput setf 4)
+    local green=$(tput setf 2)
+    local reset=$(tput sgr0)
+    local toend=$(tput hpa $(tput cols))$(tput cub 6)	
+    
     logger "BACKUP: $@"
 
     if [ $VERBOSE -eq 1 ]; then
@@ -54,22 +62,21 @@ backup()
     database_exclude_expression=`prepaire_skip_expression "${database_exclude[@]}"`
     f_log "Exclude databases: $database_exclude_expression"
 
-    for BDD in $(mysql --defaults-extra-file=$CONFIG_FILE --skip-column-names -B -e "$query" | egrep -v "$database_exclude_expression"); do
-	
-				touch $DST/$BDD/error.log
+    for BDD in $(mysql --defaults-file=$CONFIG_FILE --skip-column-names -B -e "$query" | egrep -v "$database_exclude_expression"); do				
 
         mkdir -p $DST/$BDD 2>/dev/null 1>&2
         chown $USER:$GROUP $DST/$BDD
         chmod $DIRECTORYATTRIBUTES $DST/$BDD
+	touch $DST/$BDD/error.log
 
         query="SHOW CREATE DATABASE \`$BDD\`;"
-        mysql --defaults-extra-file=$CONFIG_FILE --skip-column-names -B -e "$query" | awk -F"\t" '{ print $2 }' > $DST/$BDD/__create.sql
+        mysql --defaults-file=$CONFIG_FILE --skip-column-names -B -e "$query" | awk -F"\t" '{ print $2 }' > $DST/$BDD/__create.sql
         if [ -f $DST/$BDD/__create.sql ]; then
             f_log "  > Export create"
         fi
 
         query="SHOW FULL TABLES WHERE Table_type = 'VIEW';"
-        for viewName in $(mysql --defaults-extra-file=$CONFIG_FILE $BDD -N -e "$query" | sed 's/|//' | awk '{print $1}'); do
+        for viewName in $(mysql --defaults-file=$CONFIG_FILE $BDD -N -e "$query" | sed 's/|//' | awk '{print $1}'); do
             mysqldump --defaults-file=$CONFIG_FILE $BDD $viewName >> $DST/$BDD/__views.sql 2>> $DST/$BDD/error.log
             array_views+=($viewName)
         done		
@@ -96,15 +103,22 @@ backup()
         f_log "Exclude data tables: $data_tables_exclude_expression"
 		
         query="SHOW TABLES;"
-        for TABLE in $(mysql --defaults-extra-file=$CONFIG_FILE --skip-column-names -B $BDD -e "$query" | egrep -v "$tables_exclude_expression"); do
+        for TABLE in $(mysql --defaults-file=$CONFIG_FILE --skip-column-names -B $BDD -e "$query" | egrep -v "$tables_exclude_expression"); do
             f_log "  ** Dump $BDD.$TABLE"
 
             if [ $(echo $data_tables_exclude_expression| grep $TABLE) ]; then
                 f_log "Exclude data from table $TABLE"
                 mysqldump --defaults-file=$CONFIG_FILE --no-data --add-drop-table  --tab=$DST/$BDD/ $BDD $TABLE 2>> $DST/$BDD/error.log
             else
-                mysqldump --defaults-file=$CONFIG_FILE --add-drop-table --quick  --tab=$DST/$BDD/ $BDD $TABLE 2>> $DST/$BDD/error.log
-            fi            
+                # If fields has geospatial types			
+                checkGeo="mysql --defaults-file=$CONFIG_FILE -B $BDD -e \"SHOW COLUMNS FROM $TABLE WHERE Type IN ('point', 'polygon', 'geometry', 'linestring')\""			
+                hasGeo=$(eval $checkGeo)
+                if [ ! -z "$hasGeo" ]; then				
+                    mysqldump --defaults-file=$CONFIG_FILE --flush-logs --default-character-set=utf8 --add-drop-table --quick  --result-file=$DST/$BDD/$TABLE.sql $BDD $TABLE 2>> $DST/$BDD/error.log
+		else
+                    mysqldump --defaults-file=$CONFIG_FILE --flush-logs --default-character-set=utf8 --add-drop-table --quick  --tab=$DST/$BDD/ $BDD $TABLE 2>> $DST/$BDD/error.log
+		fi
+            fi           
 
             if [ -f "$DST/$BDD/$TABLE.sql" ]; then
                 chmod $FILEATTRIBUTES $DST/$BDD/$TABLE.sql
@@ -122,17 +136,17 @@ backup()
 
                     if [ $COMPRESS == 'bzip2' ]; then
 					
-												if [ -f "$DST/$BDD/$TABLE.txt.bz2" ]; then
-													rm $DST/$BDD/$TABLE.txt.bz2
-												fi					
+			if [ -f "$DST/$BDD/$TABLE.txt.bz2" ]; then
+				rm $DST/$BDD/$TABLE.txt.bz2
+			fi					
 					
                         ($COMPRESS $DST/$BDD/$TABLE.txt && chown $USER:$GROUP $DST/$BDD/$TABLE.txt.bz2 && chmod $FILEATTRIBUTES $DST/$BDD/$TABLE.txt.bz2) &
 						
                     elif [ $COMPRESS == 'gzip' ]; then
 					
-												if [ -f "$DST/$BDD/$TABLE.txt.gz" ]; then
-													rm $DST/$BDD/$TABLE.txt.gz
-												fi					
+			if [ -f "$DST/$BDD/$TABLE.txt.gz" ]; then
+				rm $DST/$BDD/$TABLE.txt.gz
+			fi					
 					
                         ($COMPRESS $DST/$BDD/$TABLE.txt && chown $USER:$GROUP $DST/$BDD/$TABLE.txt.gz && chmod $FILEATTRIBUTES $DST/$BDD/$TABLE.txt.gz) &
 						
@@ -172,7 +186,7 @@ Options:
 
 Examples:
         backup.sh --verbose --compress=
-        backup.sh --verbose --compress=zgip
+        backup.sh --verbose --compress=gzip
         backup.sh --verbose --compress=bzip2
         backup.sh --verbose --compress= --exclude="mysql"
         backup.sh --verbose --compress= --exclude="mysql" --lifetime="3 day ago"
@@ -180,6 +194,8 @@ Examples:
         backup.sh --verbose --dir="/var/backups/mysql" --config="/etc/mysql/debian.cnf" --exclude="mysql" --lifetime="1 day ago"
         backup.sh --verbose --dir="/home/backups/mysql" --exclude="mysql" --lifetime="1 day ago"
         backup.sh --verbose --dir="/home/backups/mysql" --exclude="mysql" --exclude-tables="tbl_template" --lifetime="1 day ago"
+				
+				
 EOF
 }
 
@@ -270,7 +286,7 @@ fi
 
 # === SETTINGS ===
 f_log "============================================"
-f_log "Dump into: $BACKUP_DIR"
+f_log "Dump into: $DST"
 f_log "Config file: $CONFIG_FILE"
 f_log "Verbose: $VERBOSE"
 f_log "Compress: $COMPRESS"

backup_db.sh

@@ -24,6 +24,13 @@ fi
 # === FUNCTION ===
 f_log()
 {
+    local bold=$(tput bold)
+    local yellow=$(tput setf 6)
+    local red=$(tput setf 4)
+    local green=$(tput setf 2)
+    local reset=$(tput sgr0)
+    local toend=$(tput hpa $(tput cols))$(tput cub 6)	
+    
     logger "BACKUP: $@"
 
     if [ $VERBOSE -eq 1 ]; then
@@ -55,22 +62,21 @@ backup()
 	'performance_schema'
     )
 
-    local array_views=()
-
-	touch $DST/$DATABASE/error.log
+    local array_views=()	
 
 	mkdir -p $DST/$DATABASE 2>/dev/null 1>&2
 	chown $USER:$GROUP $DST/$DATABASE
 	chmod $DIRECTORYATTRIBUTES $DST/$DATABASE
+	touch $DST/$DATABASE/error.log
 
 	query="SHOW CREATE DATABASE \`$DATABASE\`;"
-	mysql --defaults-extra-file=$CONFIG_FILE --skip-column-names -B -e "$query" | awk -F"\t" '{ print $2 }' > $DST/$DATABASE/__create.sql
+	mysql --defaults-file=$CONFIG_FILE --skip-column-names -B -e "$query" | awk -F"\t" '{ print $2 }' > $DST/$DATABASE/__create.sql
 	if [ -f $DST/$DATABASE/__create.sql ]; then
 		f_log "  > Export create"
 	fi
 
 	query="SHOW FULL TABLES WHERE Table_type = 'VIEW';"
-	for viewName in $(mysql --defaults-extra-file=$CONFIG_FILE $DATABASE -N -e "$query" | sed 's/|//' | awk '{print $1}'); do
+	for viewName in $(mysql --defaults-file=$CONFIG_FILE $DATABASE -N -e "$query" | sed 's/|//' | awk '{print $1}'); do
 		mysqldump --defaults-file=$CONFIG_FILE $DATABASE $viewName >> $DST/$DATABASE/__views.sql 2>> $DST/$DATABASE/error.log
 		array_views+=($viewName)
 	done		
@@ -89,22 +95,46 @@ backup()
 	)
 
 	tables_exclude=( ${default_tables_exclude[@]} ${array_views[@]} ${EXCLUDE_TABLES[@]} )
-	tables_exclude_expression=`prepaire_skip_expression "${tables_exclude[@]}"`
+	tables_exclude_expression=$(prepaire_skip_expression "${tables_exclude[@]}")
 	f_log "Exclude tables: $tables_exclude_expression"		
 
 	data_tables_exclude=( ${EXCLUDE_DATA_TABLES[@]} )
-	data_tables_exclude_expression=`prepaire_skip_expression "${data_tables_exclude[@]}"`
+	data_tables_exclude_expression=$(prepaire_skip_expression "${data_tables_exclude[@]}")
 	f_log "Exclude data tables: $data_tables_exclude_expression"
+
+	tables=( ${TABLES[@]} )
+	tables_expression=$(prepaire_skip_expression "${tables[@]}")
+	f_log "Only tables: $tables_expression"
 	
 	query="SHOW TABLES;"
-	for TABLE in $(mysql --defaults-extra-file=$CONFIG_FILE --skip-column-names -B $DATABASE -e "$query" | egrep -v "$tables_exclude_expression"); do
-		f_log "  ** Dump $DATABASE.$TABLE"
+	command="mysql --defaults-file=$CONFIG_FILE --skip-column-names -B $DATABASE -e \"$query\""
+	
+	if [ $tables_exclude_expression ]; then
+		command=" $command | egrep -v \"$tables_exclude_expression\""
+	fi
+
+	if [ $tables_expression ]; then
+		command=" $command | egrep \"$tables_expression\""
+	fi
+	
+	f_log "Command: $command"
+	
+	for TABLE in $(eval $command); do
+	
+		f_log " ** Dump $DATABASE.$TABLE"
 
 		if [ $(echo $data_tables_exclude_expression| grep $TABLE) ]; then
 			f_log "Exclude data from table $TABLE"
-			mysqldump --defaults-file=$CONFIG_FILE --no-data --add-drop-table  --tab=$DST/$DATABASE/ $DATABASE $TABLE 2>> $DST/$DATABASE/error.log
+			mysqldump --defaults-file=$CONFIG_FILE --no-data --add-drop-table --tab=$DST/$DATABASE/ $DATABASE $TABLE 2>> $DST/$DATABASE/error.log
 		else
-			mysqldump --defaults-file=$CONFIG_FILE --add-drop-table --quick  --tab=$DST/$DATABASE/ $DATABASE $TABLE 2>> $DST/$DATABASE/error.log
+			# If fields has geospatial types			
+			checkGeo="mysql --defaults-file=$CONFIG_FILE -B $DATABASE -e \"SHOW COLUMNS FROM $TABLE WHERE Type IN ('point', 'polygon', 'geometry', 'linestring')\""			
+			hasGeo=$(eval $checkGeo)
+			if [ ! -z "$hasGeo" ]; then
+				mysqldump --defaults-file=$CONFIG_FILE --flush-logs --default-character-set=utf8 --add-drop-table --quick --result-file=$DST/$DATABASE/$TABLE.sql $DATABASE $TABLE 2>> $DST/$DATABASE/error.log
+			else
+				mysqldump --defaults-file=$CONFIG_FILE --flush-logs --default-character-set=utf8 --add-drop-table --quick --tab=$DST/$DATABASE/ $DATABASE $TABLE 2>> $DST/$DATABASE/error.log
+			fi
 		fi            
 
 		if [ -f "$DST/$DATABASE/$TABLE.sql" ]; then
@@ -159,6 +189,7 @@ usage()
         Usage:  $0 <[database-name]> <[options]> or bash $0 <[database-name]> <[options]>
 
 Options:
+   --tables=                            Dump only such tables
    --exclude-tables=                    Exclude tables
    --exclude-data-tables=               Exclude data tables
    -c= | --compress=                    Compress with gzip or bzip2
@@ -170,7 +201,7 @@ Options:
 
 Examples:
         backup.sh --verbose --compress=
-        backup.sh --verbose --compress=zgip
+        backup.sh --verbose --compress=gzip
         backup.sh --verbose --compress=bzip2
         backup.sh --verbose --compress=
         backup.sh --verbose --compress= --lifetime="3 day ago"
@@ -178,6 +209,8 @@ Examples:
         backup.sh --verbose --dir="/var/backups/mysql" --config="/etc/mysql/debian.cnf" --lifetime="1 day ago"
         backup.sh --verbose --dir="/home/backups/mysql" --lifetime="1 day ago"
         backup.sh --verbose --dir="/home/backups/mysql" --exclude-tables="tbl_template" --lifetime="1 day ago"
+        backup.sh --verbose --dir="/home/backups/mysql" --tables="tbl_template tbl_template1 tbl_template2"
+				
 EOF
 }
 
@@ -187,6 +220,7 @@ if [ $# = 0 ]; then
 fi
 
 DATABASE=''
+TABLES=''
 EXCLUDE_TABLES=''
 EXCLUDE_DATA_TABLES=''
 BIN_DEPS="mysql mysqldump $COMPRESS"
@@ -204,6 +238,10 @@ done
 for i in "$@"
 do
     case $i in	
+        -t=* | --tables=*)
+            TABLES=( "${i#*=}" )
+            shift # past argument=value
+        ;;	
         --exclude-tables=*)
             EXCLUDE_TABLES=( "${i#*=}" )
             shift # past argument=value
@@ -259,11 +297,12 @@ fi
 
 # === SETTINGS ===
 f_log "============================================"
-f_log "Dump into: $BACKUP_DIR"
+f_log "Dump into: $DST"
 f_log "Config file: $CONFIG_FILE"
 f_log "Verbose: $VERBOSE"
 f_log "Compress: $COMPRESS"
 f_log "Database: $DATABASE"
+f_log "Tables: $TABLES"
 f_log "Exclude tables: $EXCLUDE_TABLES"
 f_log "Life time: $TIME_REMOVED_DUMP_FILES"
 f_log "============================================"

restore.sh

@@ -2,6 +2,7 @@
 
 # === CONFIG ===
 CONFIG_CHUNK=1000000
+VERBOSE=0
 
 # === DO NOT EDIT BELOW THIS LINE ===
 
@@ -10,7 +11,7 @@ if [ ! -n "$BASH" ] ;then echo Please run this script $0 with bash; exit 1; fi
 # === FUNCTIONS ===
 database_exists()
 {
-	RESULT=`mysqlshow --defaults-extra-file=$MYCNF $@| grep -v Wildcard | grep -o $@`
+	RESULT=`mysqlshow --defaults-file=$CONFIG_FILE $@| grep -v Wildcard | grep -o $@`
 	if [ "$RESULT" == "$@" ]; then
 			echo YES
 	else
@@ -20,7 +21,18 @@ database_exists()
 
 f_log() 
 {
-	logger "RESTORE: $@"
+    local bold=$(tput bold)
+    local yellow=$(tput setf 6)
+    local red=$(tput setf 4)
+    local green=$(tput setf 2)
+    local reset=$(tput sgr0)
+    local toend=$(tput hpa $(tput cols))$(tput cub 6)	
+	
+    logger "RESTORE: $@"
+	
+    if [ $VERBOSE -eq 1 ]; then
+        echo "RESTORE: $@"
+    fi	
 }
 
 restore()
@@ -47,103 +59,113 @@ restore()
 	fi
 
 	for i in $(ls -1 -d $DIR/*); do
+
+		BDD=$(basename $i)
+		
+		for skip in "${DATABASES_SKIP[@]}"; do
+			if [ $BDD = $skip ]; then
+				f_log "Skip database $BDD"
+				unset BDD
+				break
+			fi								
+		done
+		
+		for select in "${DATABASES_SELECTED[@]}"; do
+			if [ $BDD != $select ]; then
+				f_log "Skip database $BDD"
+				unset BDD
+				break
+			fi								
+		done
 	
-					BDD=$(basename $i)
-					
-					for skip in "${DATABASES_SKIP[@]}"; do
-						if [ $BDD = $skip ]; then
-							f_log "Skip database $BDD"
-							unset BDD
-							break
-						fi								
-					done
-					
-					for select in "${DATABASES_SELECTED[@]}"; do
-						if [ $BDD != $select ]; then
-							f_log "Skip database $BDD"
-							unset BDD
-							break
-						fi								
-					done
+		if [ $BDD ]; then
+		
+			if [ -f $DIR/$BDD/__create.sql ]; then
+				f_log "Create database $BDD"
+				mysql --defaults-file=$CONFIG_FILE < $DIR/$BDD/__create.sql 2>/dev/null
+			fi
+			
+			if [ $(database_exists $BDD) != "YES" ]; then
+				f_log "Error: Database $BDD dose not exists";
+			else
+			
+				tables=$(ls -1 $DIR/$BDD | grep -v __ | grep .sql | awk -F. '{print $1}' | sort | uniq)
+			
+				f_log "Create tables in $BDD"
+				for TABLE in $tables; do							
+					f_log "Create table: $BDD/$TABLE"
+					mysql --defaults-file=$CONFIG_FILE $BDD -e "SET foreign_key_checks = 0;
+						DROP TABLE IF EXISTS $TABLE;
+						SOURCE $DIR/$BDD/$TABLE.sql;
+						SET foreign_key_checks = 1;"
+				done
 				
-					if [ $BDD ]; then
+				f_log "Import data into $BDD"		
+				for TABLE in $tables; do									
+					f_log "Import data into $BDD/$TABLE"
+						
+					if [ -f "$DIR/$BDD/$TABLE.txt.bz2" ]; then
+						f_log "< $TABLE"
+						if [ -f "$DIR/$BDD/$TABLE.txt" ]; then
+							rm $DIR/$BDD/$TABLE.txt
+						fi
+						bunzip2 -k $DIR/$BDD/$TABLE.txt.bz2
+					fi
 					
-						if [ -f $DIR/$BDD/__create.sql ]; then
-							f_log "Create database $BDD"
-							time mysql --defaults-extra-file=$MYCNF < $DIR/$BDD/__create.sql 2>/dev/null
-						fi
+					if [ -s "$DIR/$BDD/$TABLE.txt" ]; then
+
+						f_log "+ $TABLE"					
 						
-						if [ $(database_exists $BDD) != "YES" ]; then
-							f_log "Error: Database $BDD dose not exists";
-						else
-						
-							tables=$(ls -1 $i |  grep -v __ | awk -F. '{print $1}' | sort | uniq)
-						
-							f_log "Create tables in $BDD"
-							for TABLE in $tables; do							
-											f_log "Create table: $BDD/$TABLE"
-											time mysql --defaults-extra-file=$MYCNF $BDD -e "SET foreign_key_checks = 0;
-																			DROP TABLE IF EXISTS $TABLE;
-																			SOURCE $DIR/$BDD/$TABLE.sql;
-																			SET foreign_key_checks = 1;"
-							done
-							
-							f_log "Import data into $BDD"		
-							for TABLE in $tables; do									
-								f_log "Import data into $BDD/$TABLE"
-									
-								if [ -f "$DIR/$BDD/$TABLE.txt.bz2" ]; then
-									f_log "< $TABLE"
-									if [ -f "$DIR/$BDD/$TABLE.txt" ]; then
-										rm $DIR/$BDD/$TABLE.txt
-									fi
-									bunzip2 $DIR/$BDD/$TABLE.txt.bz2
-								fi
+						split -l $CONFIG_CHUNK "$DIR/$BDD/$TABLE.txt" "$DIR/$BDD/${TABLE}_part_"
+						for segment in "$DIR/$BDD/${TABLE}"_part_*; do
+							f_log "Restore from $segment"
+							mysql --defaults-file=$CONFIG_FILE $BDD --local-infile -e "SET foreign_key_checks = 0; SET unique_checks = 0; SET sql_log_bin = 0;
+							SET character_set_database=utf8;
+							LOAD DATA LOCAL INFILE '$segment'
+							INTO TABLE $TABLE;
+							SET foreign_key_checks = 1; SET unique_checks = 1; SET sql_log_bin = 1;"
 								
-								if [ -f "$DIR/$BDD/$TABLE.txt" ]; then
-									f_log "+ $TABLE"
-									split -l $CONFIG_CHUNK "$DIR/$TABLE.txt" ${TABLE}_part_
-									for segment in ${TABLE}_part_*; do
-										time mysql --defaults-extra-file=$MYCNF $BDD --local-infile -e "SET foreign_key_checks = 0; SET unique_checks = 0; SET sql_log_bin = 0;
-																		LOAD DATA LOCAL INFILE '$DIR/$BDD/$TABLE.txt'
-																		INTO TABLE $TABLE;
-																		SET foreign_key_checks = 1; SET unique_checks = 1; SET sql_log_bin = 1;"
-										rm $segment								
-									done																		
-									if [ ! -f "$DIR/$BDD/$TABLE.txt.bz2" ]; then
-										f_log "> $TABLE"
-										bzip2 $DIR/$BDD/$TABLE.txt
-									fi
-								fi
-								
-								if [ $DATABASES_TABLE_CHECK ]; then
-									if [ -f "$DIR/$BDD/$TABLE.ibd" ]; then
-										if [ ! $(innochecksum $DIR/$BDD/$TABLE.ibd) ]; then
-											f_log "$TABLE [OK]"
-										else
-											f_log "$TABLE [ERR]"
-										fi
-									fi
-								fi
-									
-							done						
-							
-							if [ -f "$DIR/$BDD/__routines.sql" ]; then
-									f_log "Import routines into $BDD"
-									time mysql --defaults-extra-file=$MYCNF $BDD < $DIR/$BDD/__routines.sql 2>/dev/null
+							if [ -f "$segment" ]; then
+								f_log "Delete segment $segment"
+								rm "$segment"
+							fi								
+						done
+						
+					fi
+					
+					if [ -f "$DIR/$BDD/$TABLE.txt" ]; then
+						f_log "Delete source: $TABLE.txt"
+						rm $DIR/$BDD/$TABLE.txt
+					fi					
+					
+					if [ $DATABASES_TABLE_CHECK ]; then
+						if [ -f "$DIR/$BDD/$TABLE.ibd" ]; then
+							if [ ! $(innochecksum $DIR/$BDD/$TABLE.ibd) ]; then
+								f_log "$TABLE [OK]"
+							else
+								f_log "$TABLE [ERR]"
 							fi
-							
-							if [ -f "$DIR/$BDD/__views.sql" ]; then
-									f_log "Import views into $BDD"
-									time mysql --defaults-extra-file=$MYCNF $BDD < $DIR/$BDD/__views.sql 2>/dev/null
-							fi
-							
 						fi
-					fi				
+					fi
+						
+				done						
+				
+				if [ -f "$DIR/$BDD/__routines.sql" ]; then
+						f_log "Import routines into $BDD"
+						mysql --defaults-file=$CONFIG_FILE $BDD < $DIR/$BDD/__routines.sql 2>/dev/null
+				fi
+				
+				if [ -f "$DIR/$BDD/__views.sql" ]; then
+						f_log "Import views into $BDD"
+						mysql --defaults-file=$CONFIG_FILE $BDD < $DIR/$BDD/__views.sql 2>/dev/null
+				fi
+				
+			fi
+		fi				
 	done
 
 	f_log "Flush privileges;"
-	time mysql --defaults-extra-file=$MYCNF -e "flush privileges;"
+	mysql --defaults-file=$CONFIG_FILE -e "flush privileges;"
 
 	f_log "** END **"
 }
@@ -157,16 +179,16 @@ This script restore databases.
 
 OPTIONS:
    -e      Exclude databases
-	 -s			 Selected databases
-	 -c			 Check innochecksum of table after import
+   -s      Selected databases
+   -c      Check innochecksum of table after import
+	 
+	 
 EOF
 }
 
 # === CHECKS ===
-if [ $# = 0 ]; then
-    usage;
-    exit;
-fi
+
+BACKUP_DIR=$(pwd)
 
 BIN_DEPS="ls grep awk sort uniq bunzip2 bzip2 mysql"
 
@@ -187,22 +209,26 @@ done
 for i in "$@"
 do
     case $i in
-        -e)
-						DATABASES_SKIP=( "${i#*=}" )
-						shift
-				;;
-        -s)
-						DATABASES_SELECTED=( "${i#*=}" )
-						shift
-				;;
-        -c)
-						DATABASES_TABLE_CHECK=1
-						shift
-				;;								
+	-e)
+	    DATABASES_SKIP=( "${i#*=}" )
+	    shift
+	;;
+	-s)
+	    DATABASES_SELECTED=( "${i#*=}" )
+	    shift
+	;;
+	-c)
+	    DATABASES_TABLE_CHECK=1
+	    shift
+	;;								
         --config=*)
             CONFIG_FILE=( "${i#*=}" )
             shift # past argument=value
         ;;
+        --chunk=*)
+            CONFIG_CHUNK=( "${i#*=}" )
+            shift # past argument=value
+        ;;        
         -v | --verbose)
             VERBOSE=1
             shift # past argument=value
@@ -217,6 +243,14 @@ do
     esac
 done
 
+# === SETTINGS ===
+f_log "============================================"
+f_log "Restore from: $BACKUP_DIR"
+f_log "Config file: $CONFIG_FILE"
+f_log "Verbose: $VERBOSE"
+f_log "Selected databases: $DATABASES_SELECTED"
+f_log "============================================"
+f_log ""
+
 # === AUTORUN ===
 restore $(pwd)
-

restore_db.sh

@@ -2,15 +2,27 @@
 
 # === CONFIG ===
 CONFIG_CHUNK=1000000
+VERBOSE=0
 
 # === DO NOT EDIT BELOW THIS LINE ===
 
 if [ ! -n "$BASH" ] ;then echo Please run this script $0 with bash; exit 1; fi
 
 # === FUNCTIONS ===
-f_log()
+f_log() 
 {
-	echo "RESTORE: $@"
+    local bold=$(tput bold)
+    local yellow=$(tput setf 6)
+    local red=$(tput setf 4)
+    local green=$(tput setf 2)
+    local reset=$(tput sgr0)
+    local toend=$(tput hpa $(tput cols))$(tput cub 6)	
+	
+    logger "RESTORE: $@"
+	
+    if [ $VERBOSE -eq 1 ]; then
+        echo "RESTORE: $@"
+    fi	
 }
 
 restore()
@@ -29,15 +41,15 @@ restore()
 
     if [ -f $DIR/__create.sql ]; then
       f_log "Create database $BDD"
-      time mysql --defaults-extra-file=$CONFIG_FILE < $DIR/__create.sql 2>/dev/null
+      mysql --defaults-file=$CONFIG_FILE < $DIR/__create.sql 2>/dev/null
     fi
 
-    tables=$(ls -1 $DIR |  grep -v __ | awk -F. '{print $1}' | sort | uniq)
+    tables=$(ls -1 $DIR | grep -v __ | grep .sql | awk -F. '{print $1}' | sort | uniq)
 
     f_log "Create tables in $BDD"
     for TABLE in $tables; do
       f_log "Create table: $BDD/$TABLE"
-      time mysql --defaults-extra-file=$CONFIG_FILE $BDD -e "SET foreign_key_checks = 0;
+      mysql --defaults-file=$CONFIG_FILE $BDD -e "SET foreign_key_checks = 0;
                       DROP TABLE IF EXISTS $TABLE;
                       SOURCE $DIR/$TABLE.sql;
                       SET foreign_key_checks = 1;"
@@ -53,49 +65,59 @@ restore()
             f_log "rm $DIR/$TABLE.txt"
             rm $DIR/$TABLE.txt
           fi
-          bunzip2 $DIR/$TABLE.txt.bz2
+          bunzip2 -k $DIR/$TABLE.txt.bz2
       fi
 
-      if [ -f "$DIR/$TABLE.txt" ]; then
-        f_log "+ $TABLE"
-		split -l $CONFIG_CHUNK "$DIR/$TABLE.txt" ${TABLE}_part_
-		for segment in ${TABLE}_part_*; do 
-          time mysql --defaults-extra-file=$CONFIG_FILE $BDD --local-infile -e "SET foreign_key_checks = 0; SET unique_checks = 0; SET sql_log_bin = 0;
-                  LOAD DATA LOCAL INFILE '$segment'
-                  INTO TABLE $TABLE;
-                  SET foreign_key_checks = 1; SET unique_checks = 1; SET sql_log_bin = 1;"
-				rm $segment  
-        done
-        if [ ! -f "$DIR/$TABLE.txt.bz2" ]; then
-          f_log "> $TABLE"
-          bzip2 $DIR/$TABLE.txt
-        fi
-      fi
-			
-	if [ $DATABASES_TABLE_CHECK ]; then
-		if [ -f "$DIR/$BDD/$TABLE.ibd" ]; then
-			if [ ! $(innochecksum $DIR/$BDD/$TABLE.ibd) ]; then
-				f_log "$TABLE [OK]"
-			else
-				f_log "$TABLE [ERR]"
+      if [ -s "$DIR/$TABLE.txt" ]; then				
+
+		f_log "+ $TABLE"						
+        
+		split -l $CONFIG_CHUNK "$DIR/$TABLE.txt" "$DIR/${TABLE}_part_"
+		for segment in "$DIR/${TABLE}"_part_*; do
+			f_log "Restore from $segment"
+			mysql --defaults-file=$CONFIG_FILE $BDD --local-infile -e "SET foreign_key_checks = 0; SET unique_checks = 0; SET sql_log_bin = 0;
+			SET character_set_database=utf8;
+			LOAD DATA LOCAL INFILE '$segment'
+			INTO TABLE $TABLE;
+			SET foreign_key_checks = 1; SET unique_checks = 1; SET sql_log_bin = 1;"
+	
+			if [ -f "$segment" ]; then
+				f_log "Delete segment $segment"
+				rm "$segment"
+			fi			
+		done
+
+		if [ -f "$DIR/$TABLE.txt" ]; then
+			f_log "Delete source file: $TABLE.txt"
+			rm $DIR/$TABLE.txt
+		fi
+						
+	  fi
+		
+		if [ $DATABASES_TABLE_CHECK ]; then
+			if [ -f "$DIR/$BDD/$TABLE.ibd" ]; then
+				if [ ! $(innochecksum $DIR/$TABLE.ibd) ]; then
+					f_log "$TABLE [OK]"
+				else
+					f_log "$TABLE [ERR]"
+				fi
 			fi
 		fi
-	fi
 			
     done
 
     if [ -f "$DIR/__routines.sql" ]; then
       f_log "Import routines into $BDD"
-      time mysql --defaults-extra-file=$CONFIG_FILE $BDD < $DIR/__routines.sql 2>/dev/null
+      mysql --defaults-file=$CONFIG_FILE $BDD < $DIR/__routines.sql 2>/dev/null
     fi
 
     if [ -f "$DIR/__views.sql" ]; then
       f_log "Import views into $BDD"
-      time mysql --defaults-extra-file=$CONFIG_FILE $BDD < $DIR/__views.sql 2>/dev/null
+      mysql --defaults-file=$CONFIG_FILE $BDD < $DIR/__views.sql 2>/dev/null
     fi
 
     f_log "Flush privileges;"
-    time mysql --defaults-extra-file=$CONFIG_FILE -e "flush privileges;"
+    mysql --defaults-file=$CONFIG_FILE -e "flush privileges;"
 
     f_log "** END **"
 
@@ -115,16 +137,14 @@ This script restore databases.
 
 OPTIONS:
    -e      Exclude databases
-	 -s			 Selected databases
-	 -c			 Check innochecksum of table after import
+   -s      Selected databases
+   -c      Check innochecksum of table after import
+	 
+	 
 EOF
 }
 
-# === CHECKS ===
-#if [ $# = 0 ]; then
-#    usage;
-#    exit;
-#fi
+BACKUP_DIR=$(pwd)
 
 BIN_DEPS="ls grep awk sort uniq bunzip2 bzip2 mysql"
 
@@ -171,6 +191,13 @@ do
     esac
 done
 
-# === AUTORUN ===
-restore $(pwd)
+# === SETTINGS ===
+f_log "============================================"
+f_log "Restore from: $BACKUP_DIR"
+f_log "Config file: $CONFIG_FILE"
+f_log "Verbose: $VERBOSE"
+f_log "============================================"
+f_log ""
 
+# === AUTORUN ===
+restore $BACKUP_DIR