=== modified file 'driver/utility.c' --- driver/utility.c 2010-03-18 20:05:12 +0000 +++ driver/utility.c 2010-04-28 09:29:47 +0000 @@ -1235,9 +1235,7 @@ case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_NEWDECIMAL: - return (length - - test(!(field->flags & UNSIGNED_FLAG)) - /* sign? */ - test(field->decimals)); /* decimal point? */ + return length; case MYSQL_TYPE_BIT: /* @@ -1378,9 +1376,7 @@ case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_NEWDECIMAL: - return (field->length - - test(!(field->flags & UNSIGNED_FLAG)) - /* sign? */ - test(field->decimals)); /* decimal point? */ + return field->length; case MYSQL_TYPE_BIT: /* === modified file 'test/my_catalog.c' --- test/my_catalog.c 2010-01-31 00:29:06 +0000 +++ test/my_catalog.c 2010-04-28 10:35:21 +0000 @@ -450,7 +450,7 @@ { {5,2}, {5,4}, {0,2}, {10,2}, {1,2}}, { {1,2}, {5,4}, {0,-1}, {10,-1}, {1,2}}, { {12,2}, {20,4}, {0,-1}, {10,-1}, {0,2}}, - { {3,2}, {10,4}, {2,2}, {10,2}, {1,2}}, + { {3,2}, {12,4}, {2,2}, {10,2}, {1,2}}, { {-6,2}, {3,4}, {0,2}, {10,2}, {0,2}}, { {4,2}, {10,4}, {0,2}, {10,2}, {0,2}}, { {-6,2}, {3,4}, {0,2}, {10,2}, {1,2}} === modified file 'test/my_result.c' --- test/my_result.c 2010-03-24 08:44:10 +0000 +++ test/my_result.c 2010-04-28 10:46:26 +0000 @@ -310,10 +310,10 @@ is(desc_col_check(hstmt, 2, "c2", SQL_BINARY, 4, 2, 0, SQL_NO_NULLS) == OK); is(desc_col_check(hstmt, 3, "c3", SQL_CHAR, 1, 1, 0, SQL_NULLABLE) == OK); is(desc_col_check(hstmt, 4, "c4", SQL_VARCHAR, 5, 5, 0, SQL_NULLABLE) == OK); - is(desc_col_check(hstmt, 5, "c5", SQL_DECIMAL, 10, 10, 3, SQL_NO_NULLS) == OK); + is(desc_col_check(hstmt, 5, "c5", SQL_DECIMAL, 12, 12, 3, SQL_NO_NULLS) == OK); is(desc_col_check(hstmt, 6, "c6", SQL_TINYINT, 3, 4, 0, SQL_NULLABLE) == OK); is(desc_col_check(hstmt, 7, "c7", SQL_SMALLINT, 5, 6, 0, SQL_NULLABLE) == OK); - is(desc_col_check(hstmt, 8, "c8", SQL_DECIMAL, 4, 4, 2, SQL_NULLABLE) == OK); + is(desc_col_check(hstmt, 8, "c8", SQL_DECIMAL, 6, 6, 2, SQL_NULLABLE) == OK); is(desc_col_check(hstmt, 9, "c9", SQL_DOUBLE, 15, 15, 0, SQL_NULLABLE) == OK); is(desc_col_check(hstmt, 10, "c10", SQL_REAL, 7, 7, 0, SQL_NULLABLE) == OK); is(desc_col_check(hstmt, 11, "c11", SQL_BIGINT, 19, 19, 0, SQL_NO_NULLS) == OK); === modified file 'test/my_types.c' --- test/my_types.c 2010-01-31 00:29:06 +0000 +++ test/my_types.c 2010-04-28 10:49:36 +0000 @@ -523,7 +523,7 @@ NULL, 0, NULL, &scale)); is_num(fixed, SQL_FALSE); - is_num(prec, 5); + is_num(prec, 7); is_num(scale, 3); ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_CLOSE));