aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2015-06-30 23:33:07 +0200
committerNaios <naios-dev@live.de>2015-06-30 23:46:25 +0200
commit0df90fa4a44753557a6124dbb9834dae67b6cc84 (patch)
tree03792848c901864d698462b9ce55a55dbd82010c /src
parenta16d3e8eec5858290f0412e87a1d1d9908448ad7 (diff)
Core/Updater: Fix mysql cli password prompt when password is empty.
* ref: http://community.trinitycore.org/topic/11510-world-server-bug-enter-password-to-update/ (cherry picked from commit 4335611010de3e1f6c0903b4a46508b8e22db5d3)
Diffstat (limited to 'src')
-rw-r--r--src/server/shared/Updater/DBUpdater.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/shared/Updater/DBUpdater.cpp b/src/server/shared/Updater/DBUpdater.cpp
index c74b8ef868e..9e3bae11610 100644
--- a/src/server/shared/Updater/DBUpdater.cpp
+++ b/src/server/shared/Updater/DBUpdater.cpp
@@ -383,7 +383,9 @@ void DBUpdater<T>::ApplyFile(DatabaseWorkerPool<T>& pool, std::string const& hos
// CLI Client connection info
args.push_back("-h" + host);
args.push_back("-u" + user);
- args.push_back("-p" + password);
+
+ if (!password.empty())
+ args.push_back("-p" + password);
// Check if we want to connect through ip or socket (Unix only)
#ifdef _WIN32