Merge with 4.1

2 files changed, 4 insertions, 2 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);
 }
diff --git a/tests/grant.pl b/tests/grant.pl
index eb2d00f3e1d..cd6a2eb80de 100644
--- a/tests/grant.pl
+++ b/tests/grant.pl
@@ -74,9 +74,9 @@ safe_query("revoke select(user) on mysql.user from $user");
 
 safe_query("grant select on *.* to $user");
 safe_query("set password FOR ${opt_user}2\@$opt_host = password('test')",1);
-safe_query("set password FOR $opt_user=password('test')");
+safe_query("set password FOR $opt_user\@$opt_host=password('test')");
 user_connect(1);
-safe_query("set password FOR $opt_user=''");
+safe_query("set password FOR $opt_user\@$opt_host=''");
 user_connect(0);
 user_query("select * from mysql.user where user = '$opt_user'");
 user_query("select * from mysql.db where user = '$opt_user'");