From d24d151f53e9db4cbe920c1dc2aeacb631a9231d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 15 Jan 2017 10:54:23 -0500
Subject: [PATCH] Slurp db update file in and do() it instead of calling mysql

---
 scripts/zmupdate.pl.in | 50 ++++++++++--------------------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index cb0781c2e..b0f98bbd6 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -116,7 +116,7 @@ GetOptions(
     'dir:s'          =>\$updateDir
 ) or pod2usage(-exitstatus => -1);
 
-my $dbh = zmDbConnect();
+my $dbh = zmDbConnect(undef, { mysql_multi_statements=>1 } );
 $Config{ZM_DB_USER} = $dbUser;
 $Config{ZM_DB_PASS} = $dbPass;
 
@@ -449,47 +449,19 @@ if ( $version )
         my $dbh = shift;
         my $version = shift;
 
-        my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
-        my $command = "mysql -h".$host;
-        $command .= " -P".$port if defined($port);
-        if ( $dbUser )
-        {
-            $command .= " -u".$dbUser;
-            $command .= ' -p"'.$dbPass.'"' if $dbPass;
-        }
-        $command .= " ".$Config{ZM_DB_NAME}." < ";
-        if ( $updateDir )
-        {
-            $command .= $updateDir;
-        }
-        else
-        {
-            $command .= $Config{ZM_PATH_DATA}."/db";
-        }
-        $command .= "/zm_update-".$version.".sql";
+        my $file = ( $updateDir ? $updateDir : $Config{ZM_PATH_DATA}.'/db' ) . "/zm_update-$version.sql";
 
-        print( "Executing '$command'\n" ) if ( logDebugging() );
-        my $output = qx($command);
-        my $status = $? >> 8;
-        if ( $status || logDebugging() )
-        {
-                chomp( $output );
-                print( "Output: $output\n" );
-        }
-        if ( $status )
-        {
-            die( "Command '$command' exited with status: $status\n" );
-        }
-        else
-        {
-            print( "\nDatabase successfully upgraded to version $version.\n" );
-            my $sql = "update Config set Value = ? where Name = 'ZM_DYN_DB_VERSION'";
-            my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-            my $res = $sth->execute( $version ) or die( "Can't execute: ".$sth->errstr() );
-        }
+        open( my $fh, '<', $file ) or die "Unable to open $file $!";
+        $/ = undef;
+        my $sql = <$fh>;
+        close $fh;
+        $dbh->do($sql) or die $dbh->errstr();
+        print( "\nDatabase successfully upgraded to version $version.\n" );
+        my $sql = "update Config set Value = ? where Name = 'ZM_DYN_DB_VERSION'";
+        my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $version ) or die( "Can't execute: ".$sth->errstr() );
     }
 
-
     print( "\nUpgrading database to version ".ZM_VERSION."\n" );
 
     # Update config first of all