Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I7831f560165fa08882ae54efeaea1f0146c3358c

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index 83cf0394f9..71a10c45d8 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -146,6 +146,7 @@ private slots:
     void mysql_multiselect();  // For task 144331
     void mysql_savepointtest_data() { generic_data("QMYSQL"); }
     void mysql_savepointtest();
+    void mysql_connectWithInvalidAddress();
 
     void accessOdbc_strings_data() { generic_data(); }
     void accessOdbc_strings();
@@ -2192,6 +2193,14 @@ void tst_QSqlDatabase::mysql_savepointtest()
     QVERIFY_SQL(q, exec("savepoint foo"));
 }
 
+void tst_QSqlDatabase::mysql_connectWithInvalidAddress()
+{
+    // Ensure that giving invalid connection parameters fails correctly
+    QSqlDatabase db = QSqlDatabase::addDatabase("QMYSQL");
+    db.setHostName("invalid.local");
+    QCOMPARE(db.open(), false);
+}
+
 void tst_QSqlDatabase::oci_tables()
 {
     QSKIP("Requires specific permissions to create a system table");