| List: | Commits | « Previous MessageNext Message » | |
| From: | mleich | Date: | November 21 2007 1:50pm |
| Subject: | bk commit into 5.0 tree (mleich:1.2583) BUG#31567 | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.0 repository of mleich. When mleich does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-11-21 13:50:17+01:00, mleich@stripped +6 -0 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. mysql-test/suite/funcs_1/datadict/datadict_master.inc@stripped, 2007-11-21 13:50:16+01:00, mleich@stripped +7 -5 Exclude collation 'utf8_general_cs' from result set. mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@stripped, 2007-11-21 13:50:16+01:00, mleich@stripped +2 -1 Use mysqltest builtin sorting of result set. mysql-test/suite/funcs_1/datadict/datadict_tables.inc@stripped, 2007-11-21 13:50:16+01:00, mleich@stripped +2 -2 Exclude collation 'utf8_general_cs' from result set. mysql-test/suite/funcs_1/r/innodb__datadict.result@stripped, 2007-11-21 13:50:16+01:00, mleich@stripped +18 -16 Updated results mysql-test/suite/funcs_1/r/memory__datadict.result@stripped, 2007-11-21 13:50:16+01:00, mleich@stripped +18 -16 Updated results mysql-test/suite/funcs_1/r/myisam__datadict.result@stripped, 2007-11-21 13:50:16+01:00, mleich@stripped +18 -16 Updated results diff -Nrup a/mysql-test/suite/funcs_1/datadict/datadict_master.inc b/mysql-test/suite/funcs_1/datadict/datadict_master.inc --- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc 2007-08-28 18:35:22 +02:00 +++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc 2007-11-21 13:50:16 +01:00 @@ -188,7 +188,7 @@ select s.catalog_name, s.schema_name, s. --source suite/funcs_1/datadict/datadict_bug_12777.inc select * from columns; 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 from collation_character_set_applicability limit 1; select @x, @y; @@ -1649,13 +1649,14 @@ connect (u_6_401017, localhost, u_6_4010 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 table_name from tables; --source suite/funcs_1/datadict/datadict_bug_12777.inc select table_name, column_name, column_type from columns; 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 table_name, index_name from statistics; select table_name from views; @@ -1915,7 +1916,7 @@ let $message= Testcase 3.2.3.2:; # the USAGE privilege. ################################################################################ -SELECT * FROM collations; +SELECT * FROM collations where collation_name <> 'utf8_general_cs'; # ------------------------------------------------------------------------------------------------------- let $message= Testcase 3.2.3.3:; @@ -1962,7 +1963,8 @@ let $message= Testcase 3.2.4.2:; # 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:; diff -Nrup a/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc b/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc --- a/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc 2007-05-01 15:52:15 +02:00 +++ b/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc 2007-11-21 13:50:16 +01:00 @@ -35,8 +35,9 @@ eval select table_name, index_schema, in where table_schema like '$dbname%'; --replace_result $SERVER_NAME <SERVER_NAME> +--sorted_result eval select * - from information_schema.user_privileges order by grantee, privilege_type; + from information_schema.user_privileges; # where grantee="'u_6_401013'@'%'"; eval select * diff -Nrup a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc --- a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc 2007-02-06 18:54:35 +01:00 +++ b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc 2007-11-21 13:50:16 +01:00 @@ -28,8 +28,8 @@ eval $dd_part1 tables --source suite/funcs_1/datadict/datadict_bug_12777.inc eval $dd_part1 columns $dd_part2; eval $dd_part1 character_sets $dd_part2; -eval $dd_part1 collations $dd_part2; -eval $dd_part1 collation_character_set_applicability $dd_part2; +eval $dd_part1 collations where collation_name <> 'utf8_general_cs' $dd_part2; +eval $dd_part1 collation_character_set_applicability where collation_name <> 'utf8_general_cs' $dd_part2; --replace_column 16 <Created> 17 <Last_Altered> eval $dd_part1 routines $dd_part2; eval $dd_part1 statistics $dd_part2; diff -Nrup a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result --- a/mysql-test/suite/funcs_1/r/innodb__datadict.result 2007-10-17 10:22:33 +02:00 +++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result 2007-11-21 13:50:16 +01:00 @@ -2455,7 +2455,7 @@ binary binary Binary pseudo charset 1 geostd8 geostd8_general_ci GEOSTD8 Georgian 1 cp932 cp932_japanese_ci SJIS for Windows Japanese 2 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) 10741 select collation_name, character_set_name into @x,@y @@ -2860,10 +2860,10 @@ NULL information_schema CHARACTER_SETS C SELECT * FROM character_sets LIMIT 1; CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN 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 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 big5_chinese_ci big5 SELECT * FROM routines LIMIT 1; @@ -4379,10 +4379,10 @@ COUNT(*) SELECT COUNT(*) FROM information_schema. character_sets ; COUNT(*) 36 -SELECT COUNT(*) FROM information_schema. collations ; +SELECT COUNT(*) FROM information_schema. collations where collation_name <> 'utf8_general_cs' ; COUNT(*) 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(*) 126 SELECT COUNT(*) FROM information_schema. routines ; @@ -6113,7 +6113,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6258,7 +6258,7 @@ where table_schema like 'db_datadict%'; table_name index_schema index_name index_type res_t_401013 db_datadict i_6_401013 BTREE select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6389,7 +6389,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6532,7 +6532,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6671,7 +6671,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6823,7 +6823,7 @@ where table_schema like 'db_datadict%'; table_name index_schema index_name index_type res_t_401015 db_datadict i_6_401015 BTREE select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6953,7 +6953,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -7164,7 +7164,8 @@ ERROR 42000: Access denied for user 'roo FLUSH PRIVILEGES; connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK); 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 big5_chinese_ci big5 big5_bin big5 @@ -7795,7 +7796,7 @@ binary geostd8 cp932 eucjpms -select collation_name from collations; +select collation_name from collations where collation_name <> 'utf8_general_cs'; collation_name big5_chinese_ci big5_bin @@ -8159,7 +8160,7 @@ NULL information_schema COLLATIONS SORTL 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 big5_chinese_ci big5 1 Yes Yes 1 big5_bin big5 84 Yes 1 @@ -8320,7 +8321,8 @@ NULL information_schema COLLATION_CHARAC 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 big5_chinese_ci big5 big5_bin big5 diff -Nrup a/mysql-test/suite/funcs_1/r/memory__datadict.result b/mysql-test/suite/funcs_1/r/memory__datadict.result --- a/mysql-test/suite/funcs_1/r/memory__datadict.result 2007-10-17 10:22:33 +02:00 +++ b/mysql-test/suite/funcs_1/r/memory__datadict.result 2007-11-21 13:50:16 +01:00 @@ -2438,7 +2438,7 @@ binary binary Binary pseudo charset 1 geostd8 geostd8_general_ci GEOSTD8 Georgian 1 cp932 cp932_japanese_ci SJIS for Windows Japanese 2 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) 10741 select collation_name, character_set_name into @x,@y @@ -2843,10 +2843,10 @@ NULL information_schema CHARACTER_SETS C SELECT * FROM character_sets LIMIT 1; CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN 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 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 big5_chinese_ci big5 SELECT * FROM routines LIMIT 1; @@ -4362,10 +4362,10 @@ COUNT(*) SELECT COUNT(*) FROM information_schema. character_sets ; COUNT(*) 36 -SELECT COUNT(*) FROM information_schema. collations ; +SELECT COUNT(*) FROM information_schema. collations where collation_name <> 'utf8_general_cs' ; COUNT(*) 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(*) 126 SELECT COUNT(*) FROM information_schema. routines ; @@ -6096,7 +6096,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6241,7 +6241,7 @@ where table_schema like 'db_datadict%'; table_name index_schema index_name index_type res_t_401013 db_datadict i_6_401013 HASH select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6372,7 +6372,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6515,7 +6515,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6654,7 +6654,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6806,7 +6806,7 @@ where table_schema like 'db_datadict%'; table_name index_schema index_name index_type res_t_401015 db_datadict i_6_401015 BTREE select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6936,7 +6936,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -7147,7 +7147,8 @@ ERROR 42000: Access denied for user 'roo FLUSH PRIVILEGES; connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK); 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 big5_chinese_ci big5 big5_bin big5 @@ -7763,7 +7764,7 @@ binary geostd8 cp932 eucjpms -select collation_name from collations; +select collation_name from collations where collation_name <> 'utf8_general_cs'; collation_name big5_chinese_ci big5_bin @@ -8127,7 +8128,7 @@ NULL information_schema COLLATIONS SORTL 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 big5_chinese_ci big5 1 Yes Yes 1 big5_bin big5 84 Yes 1 @@ -8288,7 +8289,8 @@ NULL information_schema COLLATION_CHARAC 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 big5_chinese_ci big5 big5_bin big5 diff -Nrup a/mysql-test/suite/funcs_1/r/myisam__datadict.result b/mysql-test/suite/funcs_1/r/myisam__datadict.result --- a/mysql-test/suite/funcs_1/r/myisam__datadict.result 2007-10-17 10:22:33 +02:00 +++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result 2007-11-21 13:50:16 +01:00 @@ -2508,7 +2508,7 @@ binary binary Binary pseudo charset 1 geostd8 geostd8_general_ci GEOSTD8 Georgian 1 cp932 cp932_japanese_ci SJIS for Windows Japanese 2 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) 10741 select collation_name, character_set_name into @x,@y @@ -2913,10 +2913,10 @@ NULL information_schema CHARACTER_SETS C SELECT * FROM character_sets LIMIT 1; CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN 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 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 big5_chinese_ci big5 SELECT * FROM routines LIMIT 1; @@ -4432,10 +4432,10 @@ COUNT(*) SELECT COUNT(*) FROM information_schema. character_sets ; COUNT(*) 36 -SELECT COUNT(*) FROM information_schema. collations ; +SELECT COUNT(*) FROM information_schema. collations where collation_name <> 'utf8_general_cs' ; COUNT(*) 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(*) 126 SELECT COUNT(*) FROM information_schema. routines ; @@ -6166,7 +6166,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6311,7 +6311,7 @@ where table_schema like 'db_datadict%'; table_name index_schema index_name index_type res_t_401013 db_datadict i_6_401013 BTREE select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6442,7 +6442,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6585,7 +6585,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6724,7 +6724,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -6876,7 +6876,7 @@ where table_schema like 'db_datadict%'; table_name index_schema index_name index_type res_t_401015 db_datadict i_6_401015 BTREE select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -7006,7 +7006,7 @@ from information_schema.statistics where table_schema like 'db_datadict%'; table_name index_schema index_name index_type select * -from information_schema.user_privileges order by grantee, privilege_type; +from information_schema.user_privileges; GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE 'root'@'127.0.0.1' NULL ALTER YES 'root'@'127.0.0.1' NULL ALTER ROUTINE YES @@ -7217,7 +7217,8 @@ ERROR 42000: Access denied for user 'roo FLUSH PRIVILEGES; connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK); 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 big5_chinese_ci big5 big5_bin big5 @@ -7865,7 +7866,7 @@ binary geostd8 cp932 eucjpms -select collation_name from collations; +select collation_name from collations where collation_name <> 'utf8_general_cs'; collation_name big5_chinese_ci big5_bin @@ -8229,7 +8230,7 @@ NULL information_schema COLLATIONS SORTL 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 big5_chinese_ci big5 1 Yes Yes 1 big5_bin big5 84 Yes 1 @@ -8390,7 +8391,8 @@ NULL information_schema COLLATION_CHARAC 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 big5_chinese_ci big5 big5_bin big5
| Thread | ||
|---|---|---|
| • bk commit into 5.0 tree (mleich:1.2583) BUG#31567 | mleich | 21 Nov |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.641 sec. using MySQL 5.1.14-beta-log