diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-20 06:48:04 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-20 06:48:04 (GMT) |
| commit | b6d86906b5f2a5fa779bb9b899a6a945a1c3ea27 (patch) | |
| tree | 3e91aca779456aaa28c1dec44a6bafaeda56583c | |
| parent | 04648b44f0784223122a782320d0b09b5c1e9497 (diff) | |
| parent | f38eb1b6edf8f6d758899c8ca4a4bae2d7eb4b92 (diff) | |
| download | Qt-b6d86906b5f2a5fa779bb9b899a6a945a1c3ea27.zip Qt-b6d86906b5f2a5fa779bb9b899a6a945a1c3ea27.tar.gz Qt-b6d86906b5f2a5fa779bb9b899a6a945a1c3ea27.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | tests/auto/qsqlquery/tst_qsqlquery.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp index 546c105..98030d1 100644 --- a/tests/auto/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp @@ -194,7 +194,6 @@ private slots: void sqlServerReturn0_data() { generic_data(); } void sqlServerReturn0(); - private: // returns all database connections void generic_data(const QString &engine=QString()); @@ -510,9 +509,7 @@ void tst_QSqlQuery::mysqlOutValues() QVERIFY_SQL( q, exec( "create procedure " + qTableName( "qtestproc" ) + " () " "BEGIN select * from " + qTableName( "qtest" ) + " order by id; END" ) ); QVERIFY_SQL( q, exec( "call " + qTableName( "qtestproc" ) + "()" ) ); - QEXPECT_FAIL("", "There's a mysql bug that means only selects think they return data when running in prepared mode", Continue); QVERIFY_SQL( q, next() ); - QEXPECT_FAIL("", "There's a mysql bug that means only selects think they return data when running in prepared mode", Continue); QCOMPARE( q.value( 1 ).toString(), QString( "VarChar1" ) ); QVERIFY_SQL( q, exec( "drop procedure " + qTableName( "qtestproc" ) ) ); |