=== modified file 'cmake/FindMySQL.cmake' --- cmake/FindMySQL.cmake 2010-01-30 23:08:01 +0000 +++ cmake/FindMySQL.cmake 2010-06-03 14:32:40 +0000 @@ -57,6 +57,7 @@ FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient PATHS + $ENV{MYSQL_DIR}/lib $ENV{MYSQL_DIR}/lib/${libsuffixDist} $ENV{MYSQL_DIR}/libmysql/${libsuffixBuild} $ENV{MYSQL_DIR}/client/${libsuffixBuild} === modified file 'driver/results.c' --- driver/results.c 2010-01-30 23:08:01 +0000 +++ driver/results.c 2010-06-03 16:11:56 +0000 @@ -708,8 +708,7 @@ case SQL_COLUMN_LENGTH: case SQL_DESC_OCTET_LENGTH: /* Need to add 1 for \0 on character fields. */ - *NumericAttributePtr= get_transfer_octet_length(stmt, field) + - test(field->charsetnr != 63); + *NumericAttributePtr= get_transfer_octet_length(stmt, field); break; case SQL_DESC_LITERAL_SUFFIX: === modified file 'test/my_types.c' --- test/my_types.c 2010-01-30 23:08:01 +0000 +++ test/my_types.c 2010-06-03 16:24:50 +0000 @@ -503,7 +503,7 @@ SQLLEN len; ok_sql(hstmt, "DROP TABLE IF EXISTS t_bug27862"); - ok_sql(hstmt, "CREATE TABLE t_bug27862 (a VARCHAR(2), b VARCHAR(2))"); + ok_sql(hstmt, "CREATE TABLE t_bug27862 (a VARCHAR(2), b VARCHAR(2)) charset latin1"); ok_sql(hstmt, "INSERT INTO t_bug27862 VALUES ('a','b')"); ok_sql(hstmt, "SELECT CONCAT(a,b) FROM t_bug27862"); @@ -516,7 +516,7 @@ is_num(len, 2); ok_stmt(hstmt, SQLColAttribute(hstmt, 1, SQL_DESC_OCTET_LENGTH, NULL, 0, NULL, &len)); - is_num(len, 5); + is_num(len, 4); ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_CLOSE)); @@ -550,7 +550,7 @@ is_num(len, 26); ok_stmt(hstmt, SQLColAttribute(hstmt, 1, SQL_DESC_OCTET_LENGTH, NULL, 0, NULL, &len)); - is_num(len, 27); + is_num(len, 26); ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_CLOSE));