From c78eefbc9514cd805ec706cff43ee4413064edbe Mon Sep 17 00:00:00 2001
From: "ram@gw.mysql.r18.ru" <>
Date: Thu, 2 Dec 2004 13:34:30 +0400
Subject: Fixes (bug #6932: 'revoke all privileges...' doesn't remove all
 proper columns from columns_priv        bug #6933: error in the
 tests/grant.pl test).

---
 tests/grant.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

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'");
-- 
cgit v1.2.1


From 71bfbbdcd0660af3aab19eadf130d1e435a241aa Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Thu, 2 Dec 2004 16:08:17 +0400
Subject: Fixes to make mysql-test-run --embedded-server working

---
 tests/client_test.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests')

diff --git a/tests/client_test.c b/tests/client_test.c
index 35990a521a4..a7fadbd3033 100644
--- a/tests/client_test.c
+++ b/tests/client_test.c
@@ -683,7 +683,9 @@ 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
   DIE_UNLESS(field->length == length * cs->mbmaxlen);
+#endif
   if (def)
     DIE_UNLESS(strcmp(field->def, def) == 0);
 }
-- 
cgit v1.2.1