summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-09-29 06:11:20 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-09-29 06:11:20 (GMT)
commit13d3f1f67819ea293572ffde246cad1eeb68cee4 (patch)
treebf06ac83c293310ec4e34c806e4331b748ac62a9
parent562f05d87ee41b7b95f91eea44a4a966dbcde1b9 (diff)
parent638f46a96b68d21137c4903c68015752ebdf58dc (diff)
downloadQt-13d3f1f67819ea293572ffde246cad1eeb68cee4.zip
Qt-13d3f1f67819ea293572ffde246cad1eeb68cee4.tar.gz
Qt-13d3f1f67819ea293572ffde246cad1eeb68cee4.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
-rw-r--r--tests/auto/qsqldatabase/tst_qsqldatabase.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index ce2396d..4175bef 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -2001,6 +2001,10 @@ void tst_QSqlDatabase::odbc_bindBoolean()
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
+ if (tst_Databases::isMySQL(db)) {
+ QSKIP("MySql has inconsistent behaviour of bit field type across versions.", SkipSingle);
+ return;
+ }
QSqlQuery q(db);
QVERIFY_SQL(q, exec("CREATE TABLE " + qTableName("qtestBindBool") + "(id int, boolvalue bit)"));