mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
This commit is contained in:
@@ -698,7 +698,7 @@ static void verify_prepare_field(MYSQL_RES *result,
|
||||
fprintf(stdout, "\n org_table:`%s`\t(expected: `%s`)",
|
||||
field->org_table, org_table);
|
||||
fprintf(stdout, "\n database :`%s`\t(expected: `%s`)", field->db, db);
|
||||
fprintf(stdout, "\n length :`%ld`\t(expected: `%ld`)",
|
||||
fprintf(stdout, "\n length :`%lu`\t(expected: `%lu`)",
|
||||
field->length, length * cs->mbmaxlen);
|
||||
fprintf(stdout, "\n maxlength:`%ld`", field->max_length);
|
||||
fprintf(stdout, "\n charsetnr:`%d`", field->charsetnr);
|
||||
@@ -13634,6 +13634,31 @@ static void test_client_character_set()
|
||||
myquery(rc);
|
||||
}
|
||||
|
||||
/* Test correct max length for MEDIUMTEXT and LONGTEXT columns */
|
||||
|
||||
static void test_bug9735()
|
||||
{
|
||||
MYSQL_RES *res;
|
||||
int rc;
|
||||
|
||||
myheader("test_bug9735");
|
||||
|
||||
rc= mysql_query(mysql, "drop table if exists t1");
|
||||
myquery(rc);
|
||||
rc= mysql_query(mysql, "create table t1 (a mediumtext, b longtext) "
|
||||
"character set latin1");
|
||||
myquery(rc);
|
||||
rc= mysql_query(mysql, "select * from t1");
|
||||
myquery(rc);
|
||||
res= mysql_store_result(mysql);
|
||||
verify_prepare_field(res, 0, "a", "a", MYSQL_TYPE_BLOB,
|
||||
"t1", "t1", current_db, (1U << 24)-1, 0);
|
||||
verify_prepare_field(res, 1, "b", "b", MYSQL_TYPE_BLOB,
|
||||
"t1", "t1", current_db, ~0U, 0);
|
||||
mysql_free_result(res);
|
||||
rc= mysql_query(mysql, "drop table t1");
|
||||
myquery(rc);
|
||||
}
|
||||
|
||||
/*
|
||||
Read and parse arguments and MySQL options from my.cnf
|
||||
@@ -13876,6 +13901,7 @@ static struct my_tests_st my_tests[]= {
|
||||
{ "test_bug11172", test_bug11172 },
|
||||
{ "test_bug11656", test_bug11656 },
|
||||
{ "test_bug10214", test_bug10214 },
|
||||
{ "test_bug9735", test_bug9735 },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user