diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-03-10 02:09:43 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-03-10 02:09:43 (GMT) |
| commit | 0eb2aa1de730b0223bb0e2aa9cc53b6ee608b6bf (patch) | |
| tree | 36397a3c7d75a814327492e9450f546db016e643 /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 346b0f6247f1f8ca967f6686a849aa7464cb6b87 (diff) | |
| parent | a2427d2d9355e72a667ec2fd1a4cc018df43ec86 (diff) | |
| download | Qt-0eb2aa1de730b0223bb0e2aa9cc53b6ee608b6bf.zip Qt-0eb2aa1de730b0223bb0e2aa9cc53b6ee608b6bf.tar.gz Qt-0eb2aa1de730b0223bb0e2aa9cc53b6ee608b6bf.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Diffstat (limited to 'src/sql/drivers/mysql/qsql_mysql.cpp')
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index c0f866e..2261887 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -320,6 +320,16 @@ static bool qIsBlob(int t) || t == MYSQL_TYPE_LONG_BLOB; } +static bool qIsInteger(int t) +{ + return t == MYSQL_TYPE_TINY + || t == MYSQL_TYPE_SHORT + || t == MYSQL_TYPE_LONG + || t == MYSQL_TYPE_LONGLONG + || t == MYSQL_TYPE_INT24; +} + + void QMYSQLResultPrivate::bindBlobs() { int i; @@ -368,6 +378,13 @@ bool QMYSQLResultPrivate::bindInValues() fieldInfo->length = 0; hasBlobs = true; } else { + // fieldInfo->length specifies the display width, which may be too + // small to hold valid integer values (see + // http://dev.mysql.com/doc/refman/5.0/en/numeric-types.html ), so + // always use the MAX_BIGINT_WIDTH for integer types + if (qIsInteger(fieldInfo->type)) { + fieldInfo->length = MAX_BIGINT_WIDTH; + } fieldInfo->type = MYSQL_TYPE_STRING; } bind = &inBinds[i]; |