Bug#20166 mysql-test-run.pl does not test system privilege tables creation

 - Use mysql_system_tables.sql to create MySQL system tables in
   all places where we create them(mysql_install_db, mysql-test-run-pl
   and mysql_fix_privilege_tables.sql)

5 files changed, 8 insertions, 34 deletions

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 1dcbc693597..11c1431de7b 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -509,9 +509,11 @@ drop database mysqltest;
 select database();
 database()
 NULL
+create user mysqltest_1;
 select database(), user();
 database()	user()
 NULL	mysqltest_1@localhost
+drop user mysqltest_1;
 use test;
 create table t1 (a int, index `primary` (a));
 ERROR 42000: Incorrect index name 'primary'
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
index 8c7e39e0e90..3a098308b49 100644
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@@ -202,6 +202,7 @@ drop table t1,t2;
 SELECT a.x FROM (SELECT 1 AS x) AS a HAVING a.x = 1;
 x
 1
+create user mysqltest_1;
 create table t1 select 1 as a;
 select 2 as a from (select * from t1) b;
 ERROR 3D000: No database selected
@@ -380,3 +381,4 @@ ID	DATA	FID
 select t2.* from (select * from t1) as A inner join t2 on A.ID = t2.FID;
 ID	DATA	FID
 drop table t1, t2;
+drop user mysqltest_1;
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index f3114dc55dd..af2d4bed592 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -701,7 +701,7 @@ select * from information_schema.statistics join information_schema.columns
 using(table_name,column_name) where table_name='user';
 TABLE_NAME	COLUMN_NAME	TABLE_CATALOG	TABLE_SCHEMA	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	TABLE_CATALOG	TABLE_SCHEMA	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE		NULL	mysql	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		#	
-user	User	NULL	mysql	0	mysql	PRIMARY	2	A	5	NULL	NULL		BTREE		NULL	mysql	2		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		#	
+user	User	NULL	mysql	0	mysql	PRIMARY	2	A	3	NULL	NULL		BTREE		NULL	mysql	2		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		#	
 drop table t1;
 drop table t2;
 drop table t3;
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
index 1f93d727561..f92540a0d55 100644
--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/r/mysql_upgrade.result
@@ -20,63 +20,43 @@ mysql.user                                         OK
 1
 1
 1
-1
-1
 @hadShowDbPriv:=1
 1
 1
 1
-1
-1
 @hadCreateViewPriv:=1
 1
 1
 1
-1
-1
 @hadCreateRoutinePriv:=1
 1
 1
 1
-1
-1
 @hadCreateUserPriv:=1
 1
 1
 1
-1
-1
 Run it again - should say already completed
 @hadGrantPriv:=1
 1
 1
 1
-1
-1
 @hadShowDbPriv:=1
 1
 1
 1
-1
-1
 @hadCreateViewPriv:=1
 1
 1
 1
-1
-1
 @hadCreateRoutinePriv:=1
 1
 1
 1
-1
-1
 @hadCreateUserPriv:=1
 1
 1
 1
-1
-1
 Force should run it regardless of wheter it's been run before
 mysql.columns_priv                                 OK
 mysql.db                                           OK
@@ -99,29 +79,19 @@ mysql.user                                         OK
 1
 1
 1
-1
-1
 @hadShowDbPriv:=1
 1
 1
 1
-1
-1
 @hadCreateViewPriv:=1
 1
 1
 1
-1
-1
 @hadCreateRoutinePriv:=1
 1
 1
 1
-1
-1
 @hadCreateUserPriv:=1
 1
 1
 1
-1
-1
diff --git a/mysql-test/r/sp-security.result b/mysql-test/r/sp-security.result
index 1198efc4f3b..26b3f352a1f 100644
--- a/mysql-test/r/sp-security.result
+++ b/mysql-test/r/sp-security.result
@@ -45,7 +45,7 @@ db1_secret
 select * from db1_secret.t1;
 ERROR 42000: SELECT command denied to user ''@'localhost' for table 't1'
 create procedure db1_secret.dummy() begin end;
-ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'
+ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
 drop procedure db1_secret.dummy;
 ERROR 42000: PROCEDURE db1_secret.dummy does not exist
 select * from t1;
@@ -76,9 +76,9 @@ ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
 select db1_secret.db();
 ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
 call db1_secret.stamp(6);
-ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'
+ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
 select db1_secret.db();
-ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'
+ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
 drop database if exists db2;
 create database db2;
 use db2;