Merge embedded server testing changes from 4.1.

1 files changed, 3 insertions, 11 deletions

diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index 03d0ebf5433..88b04b292ea 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -52,9 +52,9 @@ KEY NAME (NAME));
 ALTER TABLE t1 CHANGE NAME NAME CHAR(80) not null;
 SHOW FULL COLUMNS FROM t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-GROUP_ID	int(10) unsigned	NULL	NO	PRI	0		select,insert,update,references	
-LANG_ID	smallint(5) unsigned	NULL	NO	PRI	0		select,insert,update,references	
-NAME	char(80)	latin1_swedish_ci	NO	MUL			select,insert,update,references	
+GROUP_ID	int(10) unsigned	NULL	NO	PRI	0		#	
+LANG_ID	smallint(5) unsigned	NULL	NO	PRI	0		#	
+NAME	char(80)	latin1_swedish_ci	NO	MUL			#	
 DROP TABLE t1;
 create table t1 (n int);
 insert into t1 values(9),(3),(12),(10);
@@ -117,14 +117,6 @@ name
 mysqltest
 drop table t1;
 drop database mysqltest;
-create database mysqltest;
-create table mysqltest.t1 (a int,b int,c int);
-grant all on mysqltest.t1 to mysqltest_1@localhost;
-alter table t1 rename t2;
-ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
-revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
-delete from mysql.user where user=_binary'mysqltest_1';
-drop database mysqltest;
 create table t1 (n1 int not null, n2 int, n3 int, n4 float,
 unique(n1),
 key (n1, n2, n3, n4),