Skip to content

M
mariadb
Commit 4922727f authored by mleich@five.local.lan's avatar mleich@five.local.lan
Browse files
Options

This changeset fixes 

   Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.
parent 2b985d07
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 56 deletions
mysql-test/suite/funcs_1/datadict/datadict_master.inc
View file @ 4922727f
...@@ -188,7 +188,7 @@ select s.catalog_name, s.schema_name, s.default_character_set_name, ...@@ -188,7 +188,7 @@ select s.catalog_name, s.schema_name, s.default_character_set_name,
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
select * from columns; select * from columns;
select * from character_sets; select * from character_sets;
select sum(id) from collations; select sum(id) from collations where collation_name <> 'utf8_general_cs';
select collation_name, character_set_name into @x,@y select collation_name, character_set_name into @x,@y
from collation_character_set_applicability limit 1; from collation_character_set_applicability limit 1;
select @x, @y; select @x, @y;
...@@ -1649,13 +1649,14 @@ connect (u_6_401017, localhost, u_6_401017, , test); ...@@ -1649,13 +1649,14 @@ connect (u_6_401017, localhost, u_6_401017, , test);
use information_schema; use information_schema;
select * from collation_character_set_applicability; select * from collation_character_set_applicability
where collation_name <> 'utf8_general_cs';
select * from schemata; select * from schemata;
select table_name from tables; select table_name from tables;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
select table_name, column_name, column_type from columns; select table_name, column_name, column_type from columns;
select character_set_name from character_sets; select character_set_name from character_sets;
select collation_name from collations; select collation_name from collations where collation_name <> 'utf8_general_cs';
select routine_name, routine_type from routines; select routine_name, routine_type from routines;
select table_name, index_name from statistics; select table_name, index_name from statistics;
select table_name from views; select table_name from views;
...@@ -1915,7 +1916,7 @@ let $message= Testcase 3.2.3.2:; ...@@ -1915,7 +1916,7 @@ let $message= Testcase 3.2.3.2:;
# the USAGE privilege. # the USAGE privilege.
################################################################################ ################################################################################
SELECT * FROM collations; SELECT * FROM collations where collation_name <> 'utf8_general_cs';
# ------------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------------
let $message= Testcase 3.2.3.3:; let $message= Testcase 3.2.3.3:;
...@@ -1962,7 +1963,8 @@ let $message= Testcase 3.2.4.2:; ...@@ -1962,7 +1963,8 @@ let $message= Testcase 3.2.4.2:;
# and update with expected results afterwards. # and update with expected results afterwards.
################################################################################ ################################################################################
SELECT * FROM collation_character_set_applicability; SELECT * FROM collation_character_set_applicability
where collation_name <> 'utf8_general_cs';
# ------------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------------
let $message= Testcase 3.2.4.3:; let $message= Testcase 3.2.4.3:;
......
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
View file @ 4922727f
...@@ -35,8 +35,9 @@ eval select table_name, index_schema, index_name, index_type ...@@ -35,8 +35,9 @@ eval select table_name, index_schema, index_name, index_type
where table_schema like '$dbname%'; where table_schema like '$dbname%';
--replace_result $SERVER_NAME <SERVER_NAME> --replace_result $SERVER_NAME <SERVER_NAME>
--sorted_result
eval select * eval select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
# where grantee="'u_6_401013'@'%'"; # where grantee="'u_6_401013'@'%'";
eval select * eval select *
......
mysql-test/suite/funcs_1/datadict/datadict_tables.inc
View file @ 4922727f
...@@ -28,8 +28,8 @@ eval $dd_part1 tables $dd_part2; ...@@ -28,8 +28,8 @@ eval $dd_part1 tables $dd_part2;
--source suite/funcs_1/datadict/datadict_bug_12777.inc --source suite/funcs_1/datadict/datadict_bug_12777.inc
eval $dd_part1 columns $dd_part2; eval $dd_part1 columns $dd_part2;
eval $dd_part1 character_sets $dd_part2; eval $dd_part1 character_sets $dd_part2;
eval $dd_part1 collations $dd_part2; eval $dd_part1 collations where collation_name <> 'utf8_general_cs' $dd_part2;
eval $dd_part1 collation_character_set_applicability $dd_part2; eval $dd_part1 collation_character_set_applicability where collation_name <> 'utf8_general_cs' $dd_part2;
--replace_column 16 <Created> 17 <Last_Altered> --replace_column 16 <Created> 17 <Last_Altered>
eval $dd_part1 routines $dd_part2; eval $dd_part1 routines $dd_part2;
eval $dd_part1 statistics $dd_part2; eval $dd_part1 statistics $dd_part2;
......
mysql-test/suite/funcs_1/r/innodb__datadict.result
View file @ 4922727f
...@@ -2455,7 +2455,7 @@ binary binary Binary pseudo charset 1 ...@@ -2455,7 +2455,7 @@ binary binary Binary pseudo charset 1
geostd8 geostd8_general_ci GEOSTD8 Georgian 1 geostd8 geostd8_general_ci GEOSTD8 Georgian 1
cp932 cp932_japanese_ci SJIS for Windows Japanese 2 cp932 cp932_japanese_ci SJIS for Windows Japanese 2
eucjpms eucjpms_japanese_ci UJIS for Windows Japanese 3 eucjpms eucjpms_japanese_ci UJIS for Windows Japanese 3
select sum(id) from collations; select sum(id) from collations where collation_name <> 'utf8_general_cs';
sum(id) sum(id)
10741 10741
select collation_name, character_set_name into @x,@y select collation_name, character_set_name into @x,@y
...@@ -2860,10 +2860,10 @@ NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 192 N ...@@ -2860,10 +2860,10 @@ NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 192 N
SELECT * FROM character_sets LIMIT 1; SELECT * FROM character_sets LIMIT 1;
CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
big5 big5_chinese_ci Big5 Traditional Chinese 2 big5 big5_chinese_ci Big5 Traditional Chinese 2
SELECT * FROM collations LIMIT 1; SELECT * FROM collations where collation_name <> 'utf8_general_cs' LIMIT 1;
COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN
big5_chinese_ci big5 1 Yes Yes 1 big5_chinese_ci big5 1 Yes Yes 1
SELECT * FROM collation_character_set_applicability LIMIT 1; SELECT * FROM collation_character_set_applicability where collation_name <> 'utf8_general_cs' LIMIT 1;
COLLATION_NAME CHARACTER_SET_NAME COLLATION_NAME CHARACTER_SET_NAME
big5_chinese_ci big5 big5_chinese_ci big5
SELECT * FROM routines LIMIT 1; SELECT * FROM routines LIMIT 1;
...@@ -4379,10 +4379,10 @@ COUNT(*) ...@@ -4379,10 +4379,10 @@ COUNT(*)
SELECT COUNT(*) FROM information_schema. character_sets ; SELECT COUNT(*) FROM information_schema. character_sets ;
COUNT(*) COUNT(*)
36 36
SELECT COUNT(*) FROM information_schema. collations ; SELECT COUNT(*) FROM information_schema. collations where collation_name <> 'utf8_general_cs' ;
COUNT(*) COUNT(*)
126 126
SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ; SELECT COUNT(*) FROM information_schema. collation_character_set_applicability where collation_name <> 'utf8_general_cs' ;
COUNT(*) COUNT(*)
126 126
SELECT COUNT(*) FROM information_schema. routines ; SELECT COUNT(*) FROM information_schema. routines ;
...@@ -6113,7 +6113,7 @@ from information_schema.statistics ...@@ -6113,7 +6113,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6258,7 +6258,7 @@ where table_schema like 'db_datadict%'; ...@@ -6258,7 +6258,7 @@ where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
res_t_401013 db_datadict i_6_401013 BTREE res_t_401013 db_datadict i_6_401013 BTREE
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6389,7 +6389,7 @@ from information_schema.statistics ...@@ -6389,7 +6389,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6532,7 +6532,7 @@ from information_schema.statistics ...@@ -6532,7 +6532,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6671,7 +6671,7 @@ from information_schema.statistics ...@@ -6671,7 +6671,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6823,7 +6823,7 @@ where table_schema like 'db_datadict%'; ...@@ -6823,7 +6823,7 @@ where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
res_t_401015 db_datadict i_6_401015 BTREE res_t_401015 db_datadict i_6_401015 BTREE
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6953,7 +6953,7 @@ from information_schema.statistics ...@@ -6953,7 +6953,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -7164,7 +7164,8 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_ ...@@ -7164,7 +7164,8 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK); connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK);
use information_schema; use information_schema;
select * from collation_character_set_applicability; select * from collation_character_set_applicability
where collation_name <> 'utf8_general_cs';
COLLATION_NAME CHARACTER_SET_NAME COLLATION_NAME CHARACTER_SET_NAME
big5_chinese_ci big5 big5_chinese_ci big5
big5_bin big5 big5_bin big5
...@@ -7795,7 +7796,7 @@ binary ...@@ -7795,7 +7796,7 @@ binary
geostd8 geostd8
cp932 cp932
eucjpms eucjpms
select collation_name from collations; select collation_name from collations where collation_name <> 'utf8_general_cs';
collation_name collation_name
big5_chinese_ci big5_chinese_ci
big5_bin big5_bin
...@@ -8159,7 +8160,7 @@ NULL information_schema COLLATIONS SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NUL ...@@ -8159,7 +8160,7 @@ NULL information_schema COLLATIONS SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NUL
Testcase 3.2.3.2: Testcase 3.2.3.2:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
SELECT * FROM collations; SELECT * FROM collations where collation_name <> 'utf8_general_cs';
COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN
big5_chinese_ci big5 1 Yes Yes 1 big5_chinese_ci big5 1 Yes Yes 1
big5_bin big5 84 Yes 1 big5_bin big5 84 Yes 1
...@@ -8320,7 +8321,8 @@ NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME ...@@ -8320,7 +8321,8 @@ NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME
Testcase 3.2.4.2: Testcase 3.2.4.2:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
SELECT * FROM collation_character_set_applicability; SELECT * FROM collation_character_set_applicability
where collation_name <> 'utf8_general_cs';
COLLATION_NAME CHARACTER_SET_NAME COLLATION_NAME CHARACTER_SET_NAME
big5_chinese_ci big5 big5_chinese_ci big5
big5_bin big5 big5_bin big5
......
mysql-test/suite/funcs_1/r/memory__datadict.result
View file @ 4922727f
...@@ -2438,7 +2438,7 @@ binary binary Binary pseudo charset 1 ...@@ -2438,7 +2438,7 @@ binary binary Binary pseudo charset 1
geostd8 geostd8_general_ci GEOSTD8 Georgian 1 geostd8 geostd8_general_ci GEOSTD8 Georgian 1
cp932 cp932_japanese_ci SJIS for Windows Japanese 2 cp932 cp932_japanese_ci SJIS for Windows Japanese 2
eucjpms eucjpms_japanese_ci UJIS for Windows Japanese 3 eucjpms eucjpms_japanese_ci UJIS for Windows Japanese 3
select sum(id) from collations; select sum(id) from collations where collation_name <> 'utf8_general_cs';
sum(id) sum(id)
10741 10741
select collation_name, character_set_name into @x,@y select collation_name, character_set_name into @x,@y
...@@ -2843,10 +2843,10 @@ NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 192 N ...@@ -2843,10 +2843,10 @@ NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 192 N
SELECT * FROM character_sets LIMIT 1; SELECT * FROM character_sets LIMIT 1;
CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
big5 big5_chinese_ci Big5 Traditional Chinese 2 big5 big5_chinese_ci Big5 Traditional Chinese 2
SELECT * FROM collations LIMIT 1; SELECT * FROM collations where collation_name <> 'utf8_general_cs' LIMIT 1;
COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN
big5_chinese_ci big5 1 Yes Yes 1 big5_chinese_ci big5 1 Yes Yes 1
SELECT * FROM collation_character_set_applicability LIMIT 1; SELECT * FROM collation_character_set_applicability where collation_name <> 'utf8_general_cs' LIMIT 1;
COLLATION_NAME CHARACTER_SET_NAME COLLATION_NAME CHARACTER_SET_NAME
big5_chinese_ci big5 big5_chinese_ci big5
SELECT * FROM routines LIMIT 1; SELECT * FROM routines LIMIT 1;
...@@ -4362,10 +4362,10 @@ COUNT(*) ...@@ -4362,10 +4362,10 @@ COUNT(*)
SELECT COUNT(*) FROM information_schema. character_sets ; SELECT COUNT(*) FROM information_schema. character_sets ;
COUNT(*) COUNT(*)
36 36
SELECT COUNT(*) FROM information_schema. collations ; SELECT COUNT(*) FROM information_schema. collations where collation_name <> 'utf8_general_cs' ;
COUNT(*) COUNT(*)
126 126
SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ; SELECT COUNT(*) FROM information_schema. collation_character_set_applicability where collation_name <> 'utf8_general_cs' ;
COUNT(*) COUNT(*)
126 126
SELECT COUNT(*) FROM information_schema. routines ; SELECT COUNT(*) FROM information_schema. routines ;
...@@ -6096,7 +6096,7 @@ from information_schema.statistics ...@@ -6096,7 +6096,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6241,7 +6241,7 @@ where table_schema like 'db_datadict%'; ...@@ -6241,7 +6241,7 @@ where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
res_t_401013 db_datadict i_6_401013 HASH res_t_401013 db_datadict i_6_401013 HASH
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6372,7 +6372,7 @@ from information_schema.statistics ...@@ -6372,7 +6372,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6515,7 +6515,7 @@ from information_schema.statistics ...@@ -6515,7 +6515,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6654,7 +6654,7 @@ from information_schema.statistics ...@@ -6654,7 +6654,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6806,7 +6806,7 @@ where table_schema like 'db_datadict%'; ...@@ -6806,7 +6806,7 @@ where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
res_t_401015 db_datadict i_6_401015 BTREE res_t_401015 db_datadict i_6_401015 BTREE
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6936,7 +6936,7 @@ from information_schema.statistics ...@@ -6936,7 +6936,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -7147,7 +7147,8 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_ ...@@ -7147,7 +7147,8 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK); connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK);
use information_schema; use information_schema;
select * from collation_character_set_applicability; select * from collation_character_set_applicability
where collation_name <> 'utf8_general_cs';
COLLATION_NAME CHARACTER_SET_NAME COLLATION_NAME CHARACTER_SET_NAME
big5_chinese_ci big5 big5_chinese_ci big5
big5_bin big5 big5_bin big5
...@@ -7763,7 +7764,7 @@ binary ...@@ -7763,7 +7764,7 @@ binary
geostd8 geostd8
cp932 cp932
eucjpms eucjpms
select collation_name from collations; select collation_name from collations where collation_name <> 'utf8_general_cs';
collation_name collation_name
big5_chinese_ci big5_chinese_ci
big5_bin big5_bin
...@@ -8127,7 +8128,7 @@ NULL information_schema COLLATIONS SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NUL ...@@ -8127,7 +8128,7 @@ NULL information_schema COLLATIONS SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NUL
Testcase 3.2.3.2: Testcase 3.2.3.2:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
SELECT * FROM collations; SELECT * FROM collations where collation_name <> 'utf8_general_cs';
COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN
big5_chinese_ci big5 1 Yes Yes 1 big5_chinese_ci big5 1 Yes Yes 1
big5_bin big5 84 Yes 1 big5_bin big5 84 Yes 1
...@@ -8288,7 +8289,8 @@ NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME ...@@ -8288,7 +8289,8 @@ NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME
Testcase 3.2.4.2: Testcase 3.2.4.2:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
SELECT * FROM collation_character_set_applicability; SELECT * FROM collation_character_set_applicability
where collation_name <> 'utf8_general_cs';
COLLATION_NAME CHARACTER_SET_NAME COLLATION_NAME CHARACTER_SET_NAME
big5_chinese_ci big5 big5_chinese_ci big5
big5_bin big5 big5_bin big5
......
mysql-test/suite/funcs_1/r/myisam__datadict.result
View file @ 4922727f
...@@ -2508,7 +2508,7 @@ binary binary Binary pseudo charset 1 ...@@ -2508,7 +2508,7 @@ binary binary Binary pseudo charset 1
geostd8 geostd8_general_ci GEOSTD8 Georgian 1 geostd8 geostd8_general_ci GEOSTD8 Georgian 1
cp932 cp932_japanese_ci SJIS for Windows Japanese 2 cp932 cp932_japanese_ci SJIS for Windows Japanese 2
eucjpms eucjpms_japanese_ci UJIS for Windows Japanese 3 eucjpms eucjpms_japanese_ci UJIS for Windows Japanese 3
select sum(id) from collations; select sum(id) from collations where collation_name <> 'utf8_general_cs';
sum(id) sum(id)
10741 10741
select collation_name, character_set_name into @x,@y select collation_name, character_set_name into @x,@y
...@@ -2913,10 +2913,10 @@ NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 192 N ...@@ -2913,10 +2913,10 @@ NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 192 N
SELECT * FROM character_sets LIMIT 1; SELECT * FROM character_sets LIMIT 1;
CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
big5 big5_chinese_ci Big5 Traditional Chinese 2 big5 big5_chinese_ci Big5 Traditional Chinese 2
SELECT * FROM collations LIMIT 1; SELECT * FROM collations where collation_name <> 'utf8_general_cs' LIMIT 1;
COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN
big5_chinese_ci big5 1 Yes Yes 1 big5_chinese_ci big5 1 Yes Yes 1
SELECT * FROM collation_character_set_applicability LIMIT 1; SELECT * FROM collation_character_set_applicability where collation_name <> 'utf8_general_cs' LIMIT 1;
COLLATION_NAME CHARACTER_SET_NAME COLLATION_NAME CHARACTER_SET_NAME
big5_chinese_ci big5 big5_chinese_ci big5
SELECT * FROM routines LIMIT 1; SELECT * FROM routines LIMIT 1;
...@@ -4432,10 +4432,10 @@ COUNT(*) ...@@ -4432,10 +4432,10 @@ COUNT(*)
SELECT COUNT(*) FROM information_schema. character_sets ; SELECT COUNT(*) FROM information_schema. character_sets ;
COUNT(*) COUNT(*)
36 36
SELECT COUNT(*) FROM information_schema. collations ; SELECT COUNT(*) FROM information_schema. collations where collation_name <> 'utf8_general_cs' ;
COUNT(*) COUNT(*)
126 126
SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ; SELECT COUNT(*) FROM information_schema. collation_character_set_applicability where collation_name <> 'utf8_general_cs' ;
COUNT(*) COUNT(*)
126 126
SELECT COUNT(*) FROM information_schema. routines ; SELECT COUNT(*) FROM information_schema. routines ;
...@@ -6166,7 +6166,7 @@ from information_schema.statistics ...@@ -6166,7 +6166,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6311,7 +6311,7 @@ where table_schema like 'db_datadict%'; ...@@ -6311,7 +6311,7 @@ where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
res_t_401013 db_datadict i_6_401013 BTREE res_t_401013 db_datadict i_6_401013 BTREE
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6442,7 +6442,7 @@ from information_schema.statistics ...@@ -6442,7 +6442,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6585,7 +6585,7 @@ from information_schema.statistics ...@@ -6585,7 +6585,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6724,7 +6724,7 @@ from information_schema.statistics ...@@ -6724,7 +6724,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -6876,7 +6876,7 @@ where table_schema like 'db_datadict%'; ...@@ -6876,7 +6876,7 @@ where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
res_t_401015 db_datadict i_6_401015 BTREE res_t_401015 db_datadict i_6_401015 BTREE
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -7006,7 +7006,7 @@ from information_schema.statistics ...@@ -7006,7 +7006,7 @@ from information_schema.statistics
where table_schema like 'db_datadict%'; where table_schema like 'db_datadict%';
table_name index_schema index_name index_type table_name index_schema index_name index_type
select * select *
from information_schema.user_privileges order by grantee, privilege_type; from information_schema.user_privileges;
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER YES
'root'@'127.0.0.1' NULL ALTER ROUTINE YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES
...@@ -7217,7 +7217,8 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_ ...@@ -7217,7 +7217,8 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK); connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK);
use information_schema; use information_schema;
select * from collation_character_set_applicability; select * from collation_character_set_applicability
where collation_name <> 'utf8_general_cs';
COLLATION_NAME CHARACTER_SET_NAME COLLATION_NAME CHARACTER_SET_NAME
big5_chinese_ci big5 big5_chinese_ci big5
big5_bin big5 big5_bin big5
...@@ -7865,7 +7866,7 @@ binary ...@@ -7865,7 +7866,7 @@ binary
geostd8 geostd8
cp932 cp932
eucjpms eucjpms
select collation_name from collations; select collation_name from collations where collation_name <> 'utf8_general_cs';
collation_name collation_name
big5_chinese_ci big5_chinese_ci
big5_bin big5_bin
...@@ -8229,7 +8230,7 @@ NULL information_schema COLLATIONS SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NUL ...@@ -8229,7 +8230,7 @@ NULL information_schema COLLATIONS SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NUL
Testcase 3.2.3.2: Testcase 3.2.3.2:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
SELECT * FROM collations; SELECT * FROM collations where collation_name <> 'utf8_general_cs';
COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN
big5_chinese_ci big5 1 Yes Yes 1 big5_chinese_ci big5 1 Yes Yes 1
big5_bin big5 84 Yes 1 big5_bin big5 84 Yes 1
...@@ -8390,7 +8391,8 @@ NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME ...@@ -8390,7 +8391,8 @@ NULL information_schema COLLATION_CHARACTER_SET_APPLICABILITY CHARACTER_SET_NAME
Testcase 3.2.4.2: Testcase 3.2.4.2:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
SELECT * FROM collation_character_set_applicability; SELECT * FROM collation_character_set_applicability
where collation_name <> 'utf8_general_cs';
COLLATION_NAME CHARACTER_SET_NAME COLLATION_NAME CHARACTER_SET_NAME
big5_chinese_ci big5 big5_chinese_ci big5
big5_bin big5 big5_bin big5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7