From 91aef0a1743e686df66e8e5866347119e0993e9a Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Sun, 16 Jul 2017 19:40:44 +0000
Subject: [PATCH] 93_DbRep: minor bugfixes

git-svn-id: https://svn.fhem.de/fhem/trunk@14731 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED          | 1 +
 fhem/FHEM/93_DbRep.pm | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index f5df89249..ac472f25f 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - bugfix:  93_DbRep: minor bugfixes (thanks to Omega)
   - feature: 49_TBot_List: configure also add with attr confirmUnsolicited
   - feature: 49_TBot_List: configure confirm delete  as attribute confirmDelete 
   - changed: 98_fheminfo.pm: remove release, featurelevel, uptime infos
diff --git a/fhem/FHEM/93_DbRep.pm b/fhem/FHEM/93_DbRep.pm
index 8fec3a8ee..92c2a90ca 100644
--- a/fhem/FHEM/93_DbRep.pm
+++ b/fhem/FHEM/93_DbRep.pm
@@ -41,6 +41,8 @@
 ###########################################################################################################################
 #  Versions History:
 #
+# 5.5.2        16.07.2017       dbmeta_DoParse -> show variables (no global)
+# 5.5.1        16.07.2017       wrong text output in state when restoreMySQL was aborted by timeout
 # 5.5.0        10.07.2017       replace $hash->{dbloghash}{DBMODEL} by $hash->{dbloghash}{MODEL} (DbLog was changed)
 # 5.4.0        03.07.2017       restoreMySQL - restore of csv-files (from dumpServerSide), 
 #                               RestoreRowsHistory/ DumpRowsHistory, Commandref revised
@@ -231,7 +233,7 @@ use Encode qw(encode_utf8);
 
 sub DbRep_Main($$;$);
 
-my $DbRepVersion = "5.5.0";
+my $DbRepVersion = "5.5.2";
 
 my %dbrep_col = ("DEVICE"  => 64,
                  "TYPE"    => 64,
@@ -982,7 +984,7 @@ sub DbRep_Main($$;$) {
  
  if ($opt =~ /restoreMySQL/) {	
      BlockingKill($hash->{HELPER}{RUNNING_BCKPREST_SERVER}) if (exists($hash->{HELPER}{RUNNING_BCKPREST_SERVER}));
-     $hash->{HELPER}{RUNNING_BCKPREST_SERVER} = BlockingCall("mysql_RestoreServerSide", "$name|$cmd", "RestoreDone", $to, "DumpAborted", $hash);
+     $hash->{HELPER}{RUNNING_BCKPREST_SERVER} = BlockingCall("mysql_RestoreServerSide", "$name|$cmd", "RestoreDone", $to, "RestoreAborted", $hash);
 	 ReadingsSingleUpdateValue ($hash, "state", "restore database is running - be patient and see Logfile !", 1);
      return;
  }
@@ -3850,7 +3852,7 @@ sub dbmeta_DoParse($) {
  if ($opt ne "svrinfo") {
     foreach my $ple (@parlist) {
          if ($opt eq "dbvars") {
-             $sql = "show global variables like '$ple';";
+             $sql = "show variables like '$ple';";
          } elsif ($opt eq "dbstatus") {
              $sql = "show global status like '$ple';";
          } elsif ($opt eq "tableinfo") {