diff options
author | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
commit | 19a95482195a158425c66ac629d07da53e4fc1b6 (patch) | |
tree | 5cfc0009e76810724a4db2904e75e2db2506bd46 /tests/client_test.c | |
parent | a4a69f73126d247a519a50f5ba21357ce13839fe (diff) | |
parent | a1fba2daccee3c7c5d46cded39fda7ee7f0d6eae (diff) | |
download | mariadb-git-19a95482195a158425c66ac629d07da53e4fc1b6.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'tests/client_test.c')
-rw-r--r-- | tests/client_test.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/client_test.c b/tests/client_test.c index 8bc945eac2c..aac0a92df65 100644 --- a/tests/client_test.c +++ b/tests/client_test.c @@ -694,8 +694,10 @@ static void verify_prepare_field(MYSQL_RES *result, as utf8. Field length is calculated as number of characters * maximum number of bytes a character can occupy. */ +#ifndef EMBEDDED_LIBRARY if (length) DIE_UNLESS(field->length == length * cs->mbmaxlen); +#endif if (def) DIE_UNLESS(strcmp(field->def, def) == 0); } |