Skip to content

M
MariaDB
Commit 705d58f8 authored by unknown's avatar unknown
Browse files
Options

Merge five.local.lan:/work/merge/mysql-5.0-build-30418 

into  five.local.lan:/work/merge/mysql-5.1-build-31610


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Auto merged
parents df20252c b6c38105
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 56 deletions
mysql-test/suite/funcs_1/datadict/datadict_master.inc
View file @ 705d58f8
...@@ -199,7 +199,7 @@ select s.catalog_name, s.schema_name, s.default_character_set_name, ...@@ -199,7 +199,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;
...@@ -1660,13 +1660,14 @@ connect (u_6_401017, localhost, u_6_401017, , test); ...@@ -1660,13 +1660,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;
...@@ -1926,7 +1927,7 @@ let $message= Testcase 3.2.3.2:; ...@@ -1926,7 +1927,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:;
...@@ -1973,7 +1974,8 @@ let $message= Testcase 3.2.4.2:; ...@@ -1973,7 +1974,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 @ 705d58f8
...@@ -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 @ 705d58f8
...@@ -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 @ 705d58f8
...@@ -3139,7 +3139,7 @@ binary binary Binary pseudo charset 1 ...@@ -3139,7 +3139,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)
10840 10840
select collation_name, character_set_name into @x,@y select collation_name, character_set_name into @x,@y
...@@ -3610,10 +3610,10 @@ NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 192 N ...@@ -3610,10 +3610,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;
...@@ -5596,10 +5596,10 @@ COUNT(*) ...@@ -5596,10 +5596,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(*)
127 127
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(*)
128 128
SELECT COUNT(*) FROM information_schema. routines ; SELECT COUNT(*) FROM information_schema. routines ;
...@@ -7354,7 +7354,7 @@ from information_schema.statistics ...@@ -7354,7 +7354,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
...@@ -7505,7 +7505,7 @@ where table_schema like 'db_datadict%'; ...@@ -7505,7 +7505,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
...@@ -7642,7 +7642,7 @@ from information_schema.statistics ...@@ -7642,7 +7642,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
...@@ -7791,7 +7791,7 @@ from information_schema.statistics ...@@ -7791,7 +7791,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
...@@ -7936,7 +7936,7 @@ from information_schema.statistics ...@@ -7936,7 +7936,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
...@@ -8094,7 +8094,7 @@ where table_schema like 'db_datadict%'; ...@@ -8094,7 +8094,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
...@@ -8230,7 +8230,7 @@ from information_schema.statistics ...@@ -8230,7 +8230,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
...@@ -8480,7 +8480,8 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_ ...@@ -8480,7 +8480,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
...@@ -9262,7 +9263,7 @@ binary ...@@ -9262,7 +9263,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
...@@ -9627,7 +9628,7 @@ NULL information_schema collations SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NUL ...@@ -9627,7 +9628,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
...@@ -9789,7 +9790,8 @@ NULL information_schema collation_character_set_applicability CHARACTER_SET_NAME ...@@ -9789,7 +9790,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 @ 705d58f8
...@@ -3122,7 +3122,7 @@ binary binary Binary pseudo charset 1 ...@@ -3122,7 +3122,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)
10840 10840
select collation_name, character_set_name into @x,@y select collation_name, character_set_name into @x,@y
...@@ -3593,10 +3593,10 @@ NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 192 N ...@@ -3593,10 +3593,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;
...@@ -5579,10 +5579,10 @@ COUNT(*) ...@@ -5579,10 +5579,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(*)
127 127
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(*)
128 128
SELECT COUNT(*) FROM information_schema. routines ; SELECT COUNT(*) FROM information_schema. routines ;
...@@ -7337,7 +7337,7 @@ from information_schema.statistics ...@@ -7337,7 +7337,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
...@@ -7488,7 +7488,7 @@ where table_schema like 'db_datadict%'; ...@@ -7488,7 +7488,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
...@@ -7625,7 +7625,7 @@ from information_schema.statistics ...@@ -7625,7 +7625,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
...@@ -7774,7 +7774,7 @@ from information_schema.statistics ...@@ -7774,7 +7774,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
...@@ -7919,7 +7919,7 @@ from information_schema.statistics ...@@ -7919,7 +7919,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
...@@ -8077,7 +8077,7 @@ where table_schema like 'db_datadict%'; ...@@ -8077,7 +8077,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
...@@ -8213,7 +8213,7 @@ from information_schema.statistics ...@@ -8213,7 +8213,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
...@@ -8463,7 +8463,8 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_ ...@@ -8463,7 +8463,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
...@@ -9230,7 +9231,7 @@ binary ...@@ -9230,7 +9231,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
...@@ -9595,7 +9596,7 @@ NULL information_schema collations SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NUL ...@@ -9595,7 +9596,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
...@@ -9757,7 +9758,8 @@ NULL information_schema collation_character_set_applicability CHARACTER_SET_NAME ...@@ -9757,7 +9758,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 @ 705d58f8
...@@ -3192,7 +3192,7 @@ binary binary Binary pseudo charset 1 ...@@ -3192,7 +3192,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)
10840 10840
select collation_name, character_set_name into @x,@y select collation_name, character_set_name into @x,@y
...@@ -3663,10 +3663,10 @@ NULL information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 64 192 N ...@@ -3663,10 +3663,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;
...@@ -5649,10 +5649,10 @@ COUNT(*) ...@@ -5649,10 +5649,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(*)
127 127
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(*)
128 128
SELECT COUNT(*) FROM information_schema. routines ; SELECT COUNT(*) FROM information_schema. routines ;
...@@ -7407,7 +7407,7 @@ from information_schema.statistics ...@@ -7407,7 +7407,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
...@@ -7558,7 +7558,7 @@ where table_schema like 'db_datadict%'; ...@@ -7558,7 +7558,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
...@@ -7695,7 +7695,7 @@ from information_schema.statistics ...@@ -7695,7 +7695,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
...@@ -7844,7 +7844,7 @@ from information_schema.statistics ...@@ -7844,7 +7844,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
...@@ -7989,7 +7989,7 @@ from information_schema.statistics ...@@ -7989,7 +7989,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
...@@ -8147,7 +8147,7 @@ where table_schema like 'db_datadict%'; ...@@ -8147,7 +8147,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
...@@ -8283,7 +8283,7 @@ from information_schema.statistics ...@@ -8283,7 +8283,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
...@@ -8533,7 +8533,8 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_ ...@@ -8533,7 +8533,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
...@@ -9332,7 +9333,7 @@ binary ...@@ -9332,7 +9333,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
...@@ -9697,7 +9698,7 @@ NULL information_schema collations SORTLEN 6 0 NO bigint NULL NULL 19 0 NULL NUL ...@@ -9697,7 +9698,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
...@@ -9859,7 +9860,8 @@ NULL information_schema collation_character_set_applicability CHARACTER_SET_NAME ...@@ -9859,7 +9860,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