mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge four.local.lan:/WORK2/merge/mysql-5.0-build-datadict
into four.local.lan:/WORK2/merge/mysql-5.1-build-datadict It is to be expected that a post merge fix is needed. mysql-test/suite/funcs_1/README.txt: Auto merged mysql-test/suite/funcs_1/t/innodb__datadict.test: Auto merged mysql-test/suite/funcs_1/t/memory__datadict.test: Auto merged mysql-test/suite/funcs_1/t/myisam__datadict.test: Auto merged mysql-test/suite/funcs_1/datadict/datadict_master.inc: Manual merge mysql-test/suite/funcs_1/r/innodb__datadict.result: Manual merge mysql-test/suite/funcs_1/r/memory__datadict.result: Manual merge mysql-test/suite/funcs_1/r/myisam__datadict.result: Manual merge
This commit is contained in:
@ -110,3 +110,25 @@ Carsten 16.09.2005
|
||||
4. Fixed datadict_<engine>.result files after the change that added 2 columns to
|
||||
the VIEWS table (DEFINER varchar(77), SECURITY_TYPE varchar(7)).
|
||||
===================================================================
|
||||
Matthias 25.08.2007
|
||||
-------------------
|
||||
Fixes for Bugs 30418,30420,30438,30440
|
||||
1. Replace error numbers with error names
|
||||
2. Replace static "InnoDB" (not all time available) used within an
|
||||
"alter table" by $OTHER_ENGINE_TYPE (set to MEMORY or MyISAM).
|
||||
Minor adjustment of column data type.
|
||||
3. Use mysqltest result set sorting in several cases.
|
||||
4. Avoid any statistics about help tables, because their content
|
||||
depends on configuration:
|
||||
developer release - help tables are empty
|
||||
build release - help tables have content + growing with version
|
||||
5. Add two help table related tests (one for build, one for developer)
|
||||
to ensure that informations about help tables within
|
||||
INFORMATION_SCHEMA.TABLES/STATISTICS are checked.
|
||||
General note:
|
||||
Most INFORMATION_SCHEMA properties (table layout, permissions etc.)
|
||||
are not affected by our variation of the storage engines except
|
||||
that some properties of our tables using a specific storage
|
||||
engine become visible. So it makes sense to decompose
|
||||
this test into a storage engine specific part and a non
|
||||
storage engine specific part in future.
|
||||
|
File diff suppressed because it is too large
Load Diff
22
mysql-test/suite/funcs_1/r/datadict_help_tables_build.result
Normal file
22
mysql-test/suite/funcs_1/r/datadict_help_tables_build.result
Normal file
@ -0,0 +1,22 @@
|
||||
DELETE FROM mysql.help_category LIMIT <number>;
|
||||
DELETE FROM mysql.help_keyword LIMIT <number>;
|
||||
DELETE FROM mysql.help_relation LIMIT <number>;
|
||||
DELETE FROM mysql.help_topic LIMIT <number>;
|
||||
SELECT * FROM INFORMATION_SCHEMA.TABLES
|
||||
WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
|
||||
NULL mysql help_category BASE TABLE MyISAM 10 Fixed 30 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help categories
|
||||
NULL mysql help_keyword BASE TABLE MyISAM 10 Fixed 320 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help keywords
|
||||
NULL mysql help_relation BASE TABLE MyISAM 10 Fixed 640 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL keyword-topic relation
|
||||
NULL mysql help_topic BASE TABLE MyISAM 10 Dynamic 380 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help topics
|
||||
SELECT * FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 30 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 30 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 320 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql name 1 name A 320 NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 640 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 380 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql name 1 name A 380 NULL NULL BTREE
|
18
mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result
Normal file
18
mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result
Normal file
@ -0,0 +1,18 @@
|
||||
SELECT * FROM INFORMATION_SCHEMA.TABLES
|
||||
WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
|
||||
NULL mysql help_category BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help categories
|
||||
NULL mysql help_keyword BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help keywords
|
||||
NULL mysql help_relation BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL keyword-topic relation
|
||||
NULL mysql help_topic BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help topics
|
||||
SELECT * FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE
|
@ -10,8 +10,9 @@
|
||||
. *__datadict.test are started. This can be a result of showing e.g. maximum
|
||||
. values of the number of rows of tables.
|
||||
.
|
||||
. This .result file has been checked OK with Linux 5.0.23-bk,
|
||||
. ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
|
||||
. This .result file has been checked OK with Linux 5.0.48,
|
||||
. build tree ChangeSet@1.2477.6.3, 2007-07-30
|
||||
. except that the not fixed Bug#30020 causes a difference.
|
||||
.
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
@ -1035,7 +1036,8 @@ CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT
|
||||
SELECT * FROM tables
|
||||
WHERE NOT( table_schema = 'information_schema');
|
||||
WHERE NOT( table_schema = 'information_schema')
|
||||
AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG NULL
|
||||
TABLE_SCHEMA db_datadict
|
||||
TABLE_NAME v1
|
||||
@ -3227,7 +3229,8 @@ END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh
|
||||
select count(*) from routines;
|
||||
count(*)
|
||||
1
|
||||
select * from statistics;
|
||||
select * from statistics
|
||||
where not (table_schema = 'mysql' and table_name like 'help_%');
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 2 Db A NULL NULL NULL BTREE
|
||||
@ -3241,14 +3244,6 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
|
||||
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
|
||||
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
|
||||
@ -3278,10 +3273,10 @@ NULL mysql time_zone_transition_type 0 mysql PRIMARY 2 Transition_type_id A 31 N
|
||||
NULL mysql user 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql user 0 mysql PRIMARY 2 User A 3 NULL NULL BTREE
|
||||
select * from views;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION
|
||||
NULL db_datadict v1 SELECT * FROM information_schema.tables NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu SELECT DISTINCT u, NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu1 SELECT grantee AS u NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE
|
||||
NULL db_datadict v1 /* ALGORITHM=UNDEFINED */ select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu /* ALGORITHM=UNDEFINED */ select distinct `vu1`.`u` AS `u`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3)) AS `server`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3),(length(substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3))) - 1)) AS `Server_Clean` from `db_datadict`.`vu1` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu1 /* ALGORITHM=UNDEFINED */ select `user_privileges`.`GRANTEE` AS `u` from `information_schema`.`user_privileges` NONE NO root@localhost DEFINER
|
||||
select * from user_privileges order by grantee, privilege_type;
|
||||
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
|
||||
'root'@'127.0.0.1' NULL ALTER YES
|
||||
@ -3478,8 +3473,9 @@ NULL mysql PRIMARY NULL mysql user Host 1 NULL NULL NULL NULL
|
||||
NULL mysql PRIMARY NULL mysql user User 2 NULL NULL NULL NULL
|
||||
select count(*) as max_recs from key_column_usage;
|
||||
max_recs
|
||||
45
|
||||
select max(cardinality) from statistics;
|
||||
40
|
||||
select max(cardinality) from statistics
|
||||
where not (table_schema = 'mysql' and table_name like 'help_%');
|
||||
max(cardinality)
|
||||
393
|
||||
select concat("View '",
|
||||
@ -4371,7 +4367,8 @@ CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT
|
||||
SELECT * FROM information_schema.tables
|
||||
WHERE NOT( table_schema = 'information_schema');
|
||||
WHERE NOT( table_schema = 'information_schema')
|
||||
AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG NULL
|
||||
TABLE_SCHEMA db_datadict
|
||||
TABLE_NAME v1
|
||||
@ -5687,10 +5684,10 @@ NULL mysql columns_priv 0 mysql PRIMARY 3 User A NULL NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 4 Table_name A NULL NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 5 Column_name A 0 NULL NULL BTREE
|
||||
select * from information_schema.views limit 0, 5;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION
|
||||
NULL db_datadict v1 SELECT * FROM information_schema.tables NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu SELECT DISTINCT u, NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu1 SELECT grantee AS u NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE
|
||||
NULL db_datadict v1 /* ALGORITHM=UNDEFINED */ select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu /* ALGORITHM=UNDEFINED */ select distinct `vu1`.`u` AS `u`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3)) AS `server`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3),(length(substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3))) - 1)) AS `Server_Clean` from `db_datadict`.`vu1` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu1 /* ALGORITHM=UNDEFINED */ select `user_privileges`.`GRANTEE` AS `u` from `information_schema`.`user_privileges` NONE NO root@localhost DEFINER
|
||||
select * from information_schema.user_privileges limit 0, 5;
|
||||
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
|
||||
'root'@'localhost' NULL SELECT YES
|
||||
@ -5823,10 +5820,10 @@ utf8_esperanto_ci utf8
|
||||
utf8_estonian_ci utf8
|
||||
select routine_definition from routines;
|
||||
routine_definition
|
||||
select * from statistics group by index_name asc limit 0, 5;
|
||||
select * from statistics where table_name not like 'help_%'
|
||||
group by index_name asc limit 0, 5;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL mysql procs_priv 1 mysql Grantor 1 Grantor A NULL NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
|
||||
select concat(table_schema, ', ', table_name, ', ', view_definition) view_info
|
||||
@ -5940,9 +5937,9 @@ NULL test latin1 latin1_swedish_ci NULL
|
||||
NULL test1 latin1 latin1_swedish_ci NULL
|
||||
select distinct grantee from user_privileges;
|
||||
grantee
|
||||
'root'@'localhost'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'localhost'
|
||||
select all grantee from user_privileges order by grantee, privilege_type;
|
||||
grantee
|
||||
'root'@'127.0.0.1'
|
||||
@ -5970,8 +5967,6 @@ grantee
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
@ -5997,10 +5992,6 @@ grantee
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'localhost'
|
||||
'root'@'localhost'
|
||||
'root'@'localhost'
|
||||
'root'@'localhost'
|
||||
'root'@'localhost'
|
||||
@ -7892,7 +7883,7 @@ Testcase 3.2.1.14:
|
||||
DROP DATABASE IF EXISTS db_datadict;
|
||||
CREATE DATABASE db_datadict;
|
||||
USE db_datadict;
|
||||
create table res_t_401014(f1 char(10), f2 text(25), f3 int);
|
||||
create table res_t_401014(f1 char(10), f2 varchar(25), f3 int);
|
||||
create view res_v_401014 as select * from res_t_401014;
|
||||
create procedure sp_6_401014() select 'db_datadict';
|
||||
create function fn_6_401014() returns int return 0;
|
||||
@ -7915,10 +7906,10 @@ from information_schema.columns
|
||||
where table_schema like 'db_datadict%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
|
||||
NULL db_datadict res_t_401014 f1 1 NULL YES char 10 10 NULL NULL latin1 latin1_swedish_ci char(10) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES tinytext 255 255 NULL NULL latin1 latin1_swedish_ci tinytext select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES varchar 25 25 NULL NULL latin1 latin1_swedish_ci varchar(25) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f3 3 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f1 1 NULL YES char 10 10 NULL NULL latin1 latin1_swedish_ci char(10) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f2 2 NULL YES tinytext 255 255 NULL NULL latin1 latin1_swedish_ci tinytext select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f2 2 NULL YES varchar 25 25 NULL NULL latin1 latin1_swedish_ci varchar(25) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f3 3 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
select table_schema, table_name, is_updatable
|
||||
from information_schema.views
|
||||
@ -8037,7 +8028,7 @@ WHERE trigger_schema LIKE 'db_datadict%';
|
||||
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
|
||||
use db_datadict;
|
||||
alter table res_t_401014 change f1 ff1 int;
|
||||
alter table res_t_401014 engine = innodb;
|
||||
alter table res_t_401014 engine = MEMORY;
|
||||
alter table res_t_401014 change f3 f3_new bigint;
|
||||
alter view res_v_401014 as select ff1 from res_t_401014;
|
||||
alter procedure sp_6_401014 sql security invoker;
|
||||
@ -8055,14 +8046,14 @@ select table_catalog, table_schema, engine
|
||||
from information_schema.tables
|
||||
where table_schema like 'db_datadict%';
|
||||
table_catalog table_schema engine
|
||||
NULL db_datadict InnoDB
|
||||
NULL db_datadict MEMORY
|
||||
NULL db_datadict NULL
|
||||
select *
|
||||
from information_schema.columns
|
||||
where table_schema like 'db_datadict%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
|
||||
NULL db_datadict res_t_401014 ff1 1 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES tinytext 255 255 NULL NULL latin1 latin1_swedish_ci tinytext select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES varchar 25 25 NULL NULL latin1 latin1_swedish_ci varchar(25) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f3_new 3 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(20) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 ff1 1 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
select table_schema, table_name, is_updatable
|
||||
@ -14336,7 +14327,7 @@ NULL information_schema TRIGGERS SYSTEM VIEW MyISAM 10 Dynamic NULL #ARL# #DL# #
|
||||
NULL information_schema USER_PRIVILEGES SYSTEM VIEW MEMORY 10 Fixed NULL #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL #CO#
|
||||
NULL information_schema VIEWS SYSTEM VIEW MyISAM 10 Dynamic NULL #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL #CO#
|
||||
SELECT * FROM information_schema.tables
|
||||
WHERE NOT( table_schema = 'information_schema');
|
||||
WHERE NOT( table_schema = 'information_schema') AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
|
||||
NULL db_datadict tb1 BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL
|
||||
NULL db_datadict tb2 BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL
|
||||
@ -14579,7 +14570,8 @@ TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_
|
||||
|
||||
root@localhost db_datadict_2
|
||||
REVOKE SELECT ON db_datadict.tb_6_401402_1 FROM 'user_1'@'localhost';
|
||||
SELECT * FROM information_schema.statistics;
|
||||
SELECT * FROM information_schema.statistics
|
||||
WHERE NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL db_datadict tb_6_401402_1 0 db_datadict PRIMARY 1 f1 A 0 NULL NULL BTREE
|
||||
NULL db_datadict tb_6_401402_1 1 db_datadict f2_ind 1 f2 A NULL NULL NULL YES BTREE
|
||||
@ -14601,14 +14593,6 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
|
||||
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
|
||||
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
|
||||
|
@ -10,8 +10,9 @@
|
||||
. *__datadict.test are started. This can be a result of showing e.g. maximum
|
||||
. values of the number of rows of tables.
|
||||
.
|
||||
. This .result file has been checked OK with Linux 5.0.23-bk,
|
||||
. ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
|
||||
. This .result file has been checked OK with Linux 5.0.48,
|
||||
. build tree ChangeSet@1.2477.6.3, 2007-07-30
|
||||
. except that the not fixed Bug#30020 causes a difference.
|
||||
.
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
@ -1033,7 +1034,8 @@ CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT
|
||||
SELECT * FROM tables
|
||||
WHERE NOT( table_schema = 'information_schema');
|
||||
WHERE NOT( table_schema = 'information_schema')
|
||||
AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG NULL
|
||||
TABLE_SCHEMA db_datadict
|
||||
TABLE_NAME v1
|
||||
@ -3210,7 +3212,8 @@ END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh
|
||||
select count(*) from routines;
|
||||
count(*)
|
||||
1
|
||||
select * from statistics;
|
||||
select * from statistics
|
||||
where not (table_schema = 'mysql' and table_name like 'help_%');
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 2 Db A NULL NULL NULL BTREE
|
||||
@ -3224,14 +3227,6 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
|
||||
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
|
||||
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
|
||||
@ -3261,10 +3256,10 @@ NULL mysql time_zone_transition_type 0 mysql PRIMARY 2 Transition_type_id A 31 N
|
||||
NULL mysql user 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql user 0 mysql PRIMARY 2 User A 3 NULL NULL BTREE
|
||||
select * from views;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION
|
||||
NULL db_datadict v1 SELECT * FROM information_schema.tables NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu SELECT DISTINCT u, NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu1 SELECT grantee AS u NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE
|
||||
NULL db_datadict v1 /* ALGORITHM=UNDEFINED */ select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu /* ALGORITHM=UNDEFINED */ select distinct `vu1`.`u` AS `u`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3)) AS `server`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3),(length(substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3))) - 1)) AS `Server_Clean` from `db_datadict`.`vu1` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu1 /* ALGORITHM=UNDEFINED */ select `user_privileges`.`GRANTEE` AS `u` from `information_schema`.`user_privileges` NONE NO root@localhost DEFINER
|
||||
select * from user_privileges order by grantee, privilege_type;
|
||||
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
|
||||
'root'@'127.0.0.1' NULL ALTER YES
|
||||
@ -3461,8 +3456,9 @@ NULL mysql PRIMARY NULL mysql user Host 1 NULL NULL NULL NULL
|
||||
NULL mysql PRIMARY NULL mysql user User 2 NULL NULL NULL NULL
|
||||
select count(*) as max_recs from key_column_usage;
|
||||
max_recs
|
||||
45
|
||||
select max(cardinality) from statistics;
|
||||
40
|
||||
select max(cardinality) from statistics
|
||||
where not (table_schema = 'mysql' and table_name like 'help_%');
|
||||
max(cardinality)
|
||||
393
|
||||
select concat("View '",
|
||||
@ -4354,7 +4350,8 @@ CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT
|
||||
SELECT * FROM information_schema.tables
|
||||
WHERE NOT( table_schema = 'information_schema');
|
||||
WHERE NOT( table_schema = 'information_schema')
|
||||
AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG NULL
|
||||
TABLE_SCHEMA db_datadict
|
||||
TABLE_NAME v1
|
||||
@ -5670,10 +5667,10 @@ NULL mysql columns_priv 0 mysql PRIMARY 3 User A NULL NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 4 Table_name A NULL NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 5 Column_name A 0 NULL NULL BTREE
|
||||
select * from information_schema.views limit 0, 5;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION
|
||||
NULL db_datadict v1 SELECT * FROM information_schema.tables NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu SELECT DISTINCT u, NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu1 SELECT grantee AS u NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE
|
||||
NULL db_datadict v1 /* ALGORITHM=UNDEFINED */ select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu /* ALGORITHM=UNDEFINED */ select distinct `vu1`.`u` AS `u`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3)) AS `server`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3),(length(substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3))) - 1)) AS `Server_Clean` from `db_datadict`.`vu1` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu1 /* ALGORITHM=UNDEFINED */ select `user_privileges`.`GRANTEE` AS `u` from `information_schema`.`user_privileges` NONE NO root@localhost DEFINER
|
||||
select * from information_schema.user_privileges limit 0, 5;
|
||||
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
|
||||
'root'@'localhost' NULL SELECT YES
|
||||
@ -5806,10 +5803,10 @@ utf8_esperanto_ci utf8
|
||||
utf8_estonian_ci utf8
|
||||
select routine_definition from routines;
|
||||
routine_definition
|
||||
select * from statistics group by index_name asc limit 0, 5;
|
||||
select * from statistics where table_name not like 'help_%'
|
||||
group by index_name asc limit 0, 5;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL mysql procs_priv 1 mysql Grantor 1 Grantor A NULL NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
|
||||
select concat(table_schema, ', ', table_name, ', ', view_definition) view_info
|
||||
@ -5923,9 +5920,9 @@ NULL test latin1 latin1_swedish_ci NULL
|
||||
NULL test1 latin1 latin1_swedish_ci NULL
|
||||
select distinct grantee from user_privileges;
|
||||
grantee
|
||||
'root'@'localhost'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'localhost'
|
||||
select all grantee from user_privileges order by grantee, privilege_type;
|
||||
grantee
|
||||
'root'@'127.0.0.1'
|
||||
@ -5953,8 +5950,6 @@ grantee
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
@ -5980,10 +5975,6 @@ grantee
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'localhost'
|
||||
'root'@'localhost'
|
||||
'root'@'localhost'
|
||||
'root'@'localhost'
|
||||
'root'@'localhost'
|
||||
@ -7875,7 +7866,7 @@ Testcase 3.2.1.14:
|
||||
DROP DATABASE IF EXISTS db_datadict;
|
||||
CREATE DATABASE db_datadict;
|
||||
USE db_datadict;
|
||||
create table res_t_401014(f1 char(10), f2 text(25), f3 int);
|
||||
create table res_t_401014(f1 char(10), f2 varchar(25), f3 int);
|
||||
create view res_v_401014 as select * from res_t_401014;
|
||||
create procedure sp_6_401014() select 'db_datadict';
|
||||
create function fn_6_401014() returns int return 0;
|
||||
@ -7898,10 +7889,10 @@ from information_schema.columns
|
||||
where table_schema like 'db_datadict%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
|
||||
NULL db_datadict res_t_401014 f1 1 NULL YES char 10 10 NULL NULL latin1 latin1_swedish_ci char(10) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES tinytext 255 255 NULL NULL latin1 latin1_swedish_ci tinytext select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES varchar 25 25 NULL NULL latin1 latin1_swedish_ci varchar(25) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f3 3 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f1 1 NULL YES char 10 10 NULL NULL latin1 latin1_swedish_ci char(10) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f2 2 NULL YES tinytext 255 255 NULL NULL latin1 latin1_swedish_ci tinytext select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f2 2 NULL YES varchar 25 25 NULL NULL latin1 latin1_swedish_ci varchar(25) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f3 3 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
select table_schema, table_name, is_updatable
|
||||
from information_schema.views
|
||||
@ -8020,7 +8011,7 @@ WHERE trigger_schema LIKE 'db_datadict%';
|
||||
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
|
||||
use db_datadict;
|
||||
alter table res_t_401014 change f1 ff1 int;
|
||||
alter table res_t_401014 engine = innodb;
|
||||
alter table res_t_401014 engine = MyISAM;
|
||||
alter table res_t_401014 change f3 f3_new bigint;
|
||||
alter view res_v_401014 as select ff1 from res_t_401014;
|
||||
alter procedure sp_6_401014 sql security invoker;
|
||||
@ -8038,14 +8029,14 @@ select table_catalog, table_schema, engine
|
||||
from information_schema.tables
|
||||
where table_schema like 'db_datadict%';
|
||||
table_catalog table_schema engine
|
||||
NULL db_datadict InnoDB
|
||||
NULL db_datadict MyISAM
|
||||
NULL db_datadict NULL
|
||||
select *
|
||||
from information_schema.columns
|
||||
where table_schema like 'db_datadict%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
|
||||
NULL db_datadict res_t_401014 ff1 1 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES tinytext 255 255 NULL NULL latin1 latin1_swedish_ci tinytext select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES varchar 25 25 NULL NULL latin1 latin1_swedish_ci varchar(25) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f3_new 3 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(20) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 ff1 1 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
select table_schema, table_name, is_updatable
|
||||
@ -14234,7 +14225,7 @@ NULL information_schema TRIGGERS SYSTEM VIEW MyISAM 10 Dynamic NULL #ARL# #DL# #
|
||||
NULL information_schema USER_PRIVILEGES SYSTEM VIEW MEMORY 10 Fixed NULL #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL #CO#
|
||||
NULL information_schema VIEWS SYSTEM VIEW MyISAM 10 Dynamic NULL #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL #CO#
|
||||
SELECT * FROM information_schema.tables
|
||||
WHERE NOT( table_schema = 'information_schema');
|
||||
WHERE NOT( table_schema = 'information_schema') AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
|
||||
NULL db_datadict tb1 BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL
|
||||
NULL db_datadict tb2 BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL
|
||||
@ -14477,7 +14468,8 @@ TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_
|
||||
|
||||
root@localhost db_datadict_2
|
||||
REVOKE SELECT ON db_datadict.tb_6_401402_1 FROM 'user_1'@'localhost';
|
||||
SELECT * FROM information_schema.statistics;
|
||||
SELECT * FROM information_schema.statistics
|
||||
WHERE NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL db_datadict tb_6_401402_1 0 db_datadict PRIMARY 1 f1 A 0 NULL NULL BTREE
|
||||
NULL db_datadict tb_6_401402_1 1 db_datadict f2_ind 1 f2 A NULL NULL NULL YES BTREE
|
||||
@ -14499,14 +14491,6 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
|
||||
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
|
||||
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
|
||||
|
@ -10,8 +10,9 @@
|
||||
. *__datadict.test are started. This can be a result of showing e.g. maximum
|
||||
. values of the number of rows of tables.
|
||||
.
|
||||
. This .result file has been checked OK with Linux 5.0.23-bk,
|
||||
. ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
|
||||
. This .result file has been checked OK with Linux 5.0.48,
|
||||
. build tree ChangeSet@1.2477.6.3, 2007-07-30
|
||||
. except that the not fixed Bug#30020 causes a difference.
|
||||
.
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
@ -1063,7 +1064,8 @@ CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT
|
||||
SELECT * FROM tables
|
||||
WHERE NOT( table_schema = 'information_schema');
|
||||
WHERE NOT( table_schema = 'information_schema')
|
||||
AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG NULL
|
||||
TABLE_SCHEMA db_datadict
|
||||
TABLE_NAME v1
|
||||
@ -3280,7 +3282,8 @@ END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh
|
||||
select count(*) from routines;
|
||||
count(*)
|
||||
1
|
||||
select * from statistics;
|
||||
select * from statistics
|
||||
where not (table_schema = 'mysql' and table_name like 'help_%');
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 2 Db A NULL NULL NULL BTREE
|
||||
@ -3294,14 +3297,6 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
|
||||
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
|
||||
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
|
||||
@ -3331,10 +3326,10 @@ NULL mysql time_zone_transition_type 0 mysql PRIMARY 2 Transition_type_id A 31 N
|
||||
NULL mysql user 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql user 0 mysql PRIMARY 2 User A 3 NULL NULL BTREE
|
||||
select * from views;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION
|
||||
NULL db_datadict v1 SELECT * FROM information_schema.tables NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu SELECT DISTINCT u, NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu1 SELECT grantee AS u NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE
|
||||
NULL db_datadict v1 /* ALGORITHM=UNDEFINED */ select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu /* ALGORITHM=UNDEFINED */ select distinct `vu1`.`u` AS `u`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3)) AS `server`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3),(length(substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3))) - 1)) AS `Server_Clean` from `db_datadict`.`vu1` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu1 /* ALGORITHM=UNDEFINED */ select `user_privileges`.`GRANTEE` AS `u` from `information_schema`.`user_privileges` NONE NO root@localhost DEFINER
|
||||
select * from user_privileges order by grantee, privilege_type;
|
||||
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
|
||||
'root'@'127.0.0.1' NULL ALTER YES
|
||||
@ -3532,7 +3527,8 @@ NULL mysql PRIMARY NULL mysql user User 2 NULL NULL NULL NULL
|
||||
select count(*) as max_recs from key_column_usage;
|
||||
max_recs
|
||||
45
|
||||
select max(cardinality) from statistics;
|
||||
select max(cardinality) from statistics
|
||||
where not (table_schema = 'mysql' and table_name like 'help_%');
|
||||
max(cardinality)
|
||||
393
|
||||
select concat("View '",
|
||||
@ -4424,7 +4420,8 @@ CHECKSUM NULL
|
||||
CREATE_OPTIONS #CO#
|
||||
TABLE_COMMENT
|
||||
SELECT * FROM information_schema.tables
|
||||
WHERE NOT( table_schema = 'information_schema');
|
||||
WHERE NOT( table_schema = 'information_schema')
|
||||
AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG NULL
|
||||
TABLE_SCHEMA db_datadict
|
||||
TABLE_NAME v1
|
||||
@ -5740,10 +5737,10 @@ NULL mysql columns_priv 0 mysql PRIMARY 3 User A NULL NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 4 Table_name A NULL NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 5 Column_name A 0 NULL NULL BTREE
|
||||
select * from information_schema.views limit 0, 5;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION
|
||||
NULL db_datadict v1 SELECT * FROM information_schema.tables NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu SELECT DISTINCT u, NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
NULL db_datadict vu1 SELECT grantee AS u NONE NO root@localhost DEFINER latin1 latin1_swedish_ci
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE
|
||||
NULL db_datadict v1 /* ALGORITHM=UNDEFINED */ select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu /* ALGORITHM=UNDEFINED */ select distinct `vu1`.`u` AS `u`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3)) AS `server`,substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3),(length(substr(`vu1`.`u`,(length(substring_index(`vu1`.`u`,_utf8'@',1)) + 3))) - 1)) AS `Server_Clean` from `db_datadict`.`vu1` NONE NO root@localhost DEFINER
|
||||
NULL db_datadict vu1 /* ALGORITHM=UNDEFINED */ select `user_privileges`.`GRANTEE` AS `u` from `information_schema`.`user_privileges` NONE NO root@localhost DEFINER
|
||||
select * from information_schema.user_privileges limit 0, 5;
|
||||
GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
|
||||
'root'@'localhost' NULL SELECT YES
|
||||
@ -5876,10 +5873,10 @@ utf8_esperanto_ci utf8
|
||||
utf8_estonian_ci utf8
|
||||
select routine_definition from routines;
|
||||
routine_definition
|
||||
select * from statistics group by index_name asc limit 0, 5;
|
||||
select * from statistics where table_name not like 'help_%'
|
||||
group by index_name asc limit 0, 5;
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL mysql procs_priv 1 mysql Grantor 1 Grantor A NULL NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
|
||||
select concat(table_schema, ', ', table_name, ', ', view_definition) view_info
|
||||
@ -5993,9 +5990,9 @@ NULL test latin1 latin1_swedish_ci NULL
|
||||
NULL test1 latin1 latin1_swedish_ci NULL
|
||||
select distinct grantee from user_privileges;
|
||||
grantee
|
||||
'root'@'localhost'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'127.0.0.1'
|
||||
'root'@'<SERVER_NAME>'
|
||||
'root'@'localhost'
|
||||
select all grantee from user_privileges order by grantee, privilege_type;
|
||||
grantee
|
||||
'root'@'127.0.0.1'
|
||||
@ -7945,7 +7942,7 @@ Testcase 3.2.1.14:
|
||||
DROP DATABASE IF EXISTS db_datadict;
|
||||
CREATE DATABASE db_datadict;
|
||||
USE db_datadict;
|
||||
create table res_t_401014(f1 char(10), f2 text(25), f3 int);
|
||||
create table res_t_401014(f1 char(10), f2 varchar(25), f3 int);
|
||||
create view res_v_401014 as select * from res_t_401014;
|
||||
create procedure sp_6_401014() select 'db_datadict';
|
||||
create function fn_6_401014() returns int return 0;
|
||||
@ -7968,10 +7965,10 @@ from information_schema.columns
|
||||
where table_schema like 'db_datadict%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
|
||||
NULL db_datadict res_t_401014 f1 1 NULL YES char 10 10 NULL NULL latin1 latin1_swedish_ci char(10) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES tinytext 255 255 NULL NULL latin1 latin1_swedish_ci tinytext select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES varchar 25 25 NULL NULL latin1 latin1_swedish_ci varchar(25) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f3 3 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f1 1 NULL YES char 10 10 NULL NULL latin1 latin1_swedish_ci char(10) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f2 2 NULL YES tinytext 255 255 NULL NULL latin1 latin1_swedish_ci tinytext select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f2 2 NULL YES varchar 25 25 NULL NULL latin1 latin1_swedish_ci varchar(25) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 f3 3 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
select table_schema, table_name, is_updatable
|
||||
from information_schema.views
|
||||
@ -8090,7 +8087,7 @@ WHERE trigger_schema LIKE 'db_datadict%';
|
||||
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
|
||||
use db_datadict;
|
||||
alter table res_t_401014 change f1 ff1 int;
|
||||
alter table res_t_401014 engine = innodb;
|
||||
alter table res_t_401014 engine = MEMORY;
|
||||
alter table res_t_401014 change f3 f3_new bigint;
|
||||
alter view res_v_401014 as select ff1 from res_t_401014;
|
||||
alter procedure sp_6_401014 sql security invoker;
|
||||
@ -8108,14 +8105,14 @@ select table_catalog, table_schema, engine
|
||||
from information_schema.tables
|
||||
where table_schema like 'db_datadict%';
|
||||
table_catalog table_schema engine
|
||||
NULL db_datadict InnoDB
|
||||
NULL db_datadict MEMORY
|
||||
NULL db_datadict NULL
|
||||
select *
|
||||
from information_schema.columns
|
||||
where table_schema like 'db_datadict%';
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
|
||||
NULL db_datadict res_t_401014 ff1 1 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES tinytext 255 255 NULL NULL latin1 latin1_swedish_ci tinytext select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f2 2 NULL YES varchar 25 25 NULL NULL latin1 latin1_swedish_ci varchar(25) select,insert,update,references
|
||||
NULL db_datadict res_t_401014 f3_new 3 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(20) select,insert,update,references
|
||||
NULL db_datadict res_v_401014 ff1 1 NULL YES int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
|
||||
select table_schema, table_name, is_updatable
|
||||
@ -14488,7 +14485,7 @@ NULL information_schema TRIGGERS SYSTEM VIEW MyISAM 10 Dynamic NULL #ARL# #DL# #
|
||||
NULL information_schema USER_PRIVILEGES SYSTEM VIEW MEMORY 10 Fixed NULL #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL #CO#
|
||||
NULL information_schema VIEWS SYSTEM VIEW MyISAM 10 Dynamic NULL #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL #CO#
|
||||
SELECT * FROM information_schema.tables
|
||||
WHERE NOT( table_schema = 'information_schema');
|
||||
WHERE NOT( table_schema = 'information_schema') AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
|
||||
NULL db_datadict tb1 BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL
|
||||
NULL db_datadict tb2 BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL
|
||||
@ -14731,7 +14728,8 @@ TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_
|
||||
|
||||
root@localhost db_datadict_2
|
||||
REVOKE SELECT ON db_datadict.tb_6_401402_1 FROM 'user_1'@'localhost';
|
||||
SELECT * FROM information_schema.statistics;
|
||||
SELECT * FROM information_schema.statistics
|
||||
WHERE NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
|
||||
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
|
||||
NULL db_datadict tb_6_401402_1 0 db_datadict PRIMARY 1 f1 A 0 NULL NULL BTREE
|
||||
NULL db_datadict tb_6_401402_1 1 db_datadict f2_ind 1 f2 A NULL NULL NULL YES BTREE
|
||||
@ -14753,14 +14751,6 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
|
||||
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
|
||||
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
|
||||
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE
|
||||
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
|
||||
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
|
||||
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
|
||||
|
73
mysql-test/suite/funcs_1/t/datadict_help_tables_build.test
Normal file
73
mysql-test/suite/funcs_1/t/datadict_help_tables_build.test
Normal file
@ -0,0 +1,73 @@
|
||||
###### suite/funcs_1/t/datadict_help_tables_dev.test #####
|
||||
#
|
||||
# Check the information about the help tables within
|
||||
# INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
|
||||
#
|
||||
# Variant for use during build tests (non empty help tables)
|
||||
#
|
||||
# Creation:
|
||||
# 2007-08-25 mleich Add this test as compensation for the
|
||||
# checks removed within datadict_master.inc.
|
||||
#
|
||||
|
||||
let $c_help_category= `SELECT COUNT(*) FROM mysql.help_category`;
|
||||
let $c_help_keyword= `SELECT COUNT(*) FROM mysql.help_keyword`;
|
||||
let $c_help_relation= `SELECT COUNT(*) FROM mysql.help_relation`;
|
||||
let $c_help_topic= `SELECT COUNT(*) FROM mysql.help_topic`;
|
||||
|
||||
if (`SELECT $c_help_category + $c_help_keyword + $c_help_relation
|
||||
+ $c_help_topic = 0`)
|
||||
{
|
||||
--skip # Test requires non empty help tables = Build test configuration
|
||||
}
|
||||
|
||||
# We reach this point when we run on a configuration with at least one
|
||||
# non empty help table.
|
||||
# 2007-08 MySQL 5.0 row count of the help tables
|
||||
# help_category help_keyword help_relation help_topic
|
||||
# 36 395 809 466
|
||||
# Let's assume for all help tables that their content never dramatic
|
||||
# shrinks and do some plausibility checks.
|
||||
let $limit_help_category = 30;
|
||||
let $limit_help_keyword = 320;
|
||||
let $limit_help_relation = 640;
|
||||
let $limit_help_topic = 380;
|
||||
if (`SELECT $c_help_category < $limit_help_category
|
||||
OR $c_help_keyword < $limit_help_keyword
|
||||
OR $c_help_relation < $limit_help_relation
|
||||
OR $c_help_topic < $limit_help_topic`)
|
||||
{
|
||||
--echo # The row count within the help tables is unexepected small.
|
||||
SELECT COUNT(*), 'exepected: >= $limit_help_category' FROM mysql.help_category;
|
||||
SELECT COUNT(*), 'exepected: >= $limit_help_keyword' FROM mysql.help_keyword;
|
||||
SELECT COUNT(*), 'exepected: >= $limit_help_relation' FROM mysql.help_relation;
|
||||
SELECT COUNT(*), 'exepected: >= $limit_help_topic' FROM mysql.help_topic;
|
||||
--echo # Either the current help table content (build problem? or
|
||||
--echo # the expected minimum row count within this script is wrong.
|
||||
--echo # Abort
|
||||
exit;
|
||||
}
|
||||
|
||||
# Enforce a static number of rows within the help tables.
|
||||
let $limit= `SELECT $c_help_category - $limit_help_category`;
|
||||
--replace_result $limit <number>
|
||||
eval DELETE FROM mysql.help_category LIMIT $limit;
|
||||
#
|
||||
let $limit= `SELECT $c_help_keyword - $limit_help_keyword`;
|
||||
--replace_result $limit <number>
|
||||
eval DELETE FROM mysql.help_keyword LIMIT $limit;
|
||||
#
|
||||
let $limit= `SELECT $c_help_relation - $limit_help_relation`;
|
||||
--replace_result $limit <number>
|
||||
eval DELETE FROM mysql.help_relation LIMIT $limit;
|
||||
#
|
||||
let $limit= `SELECT $c_help_topic - $limit_help_topic`;
|
||||
--replace_result $limit <number>
|
||||
eval DELETE FROM mysql.help_topic LIMIT $limit;
|
||||
|
||||
|
||||
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
|
||||
SELECT * FROM INFORMATION_SCHEMA.TABLES
|
||||
WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';
|
||||
SELECT * FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';
|
27
mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test
Normal file
27
mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test
Normal file
@ -0,0 +1,27 @@
|
||||
###### suite/funcs_1/t/datadict_help_tables_dev.test #####
|
||||
#
|
||||
# Check the information about the help tables within
|
||||
# INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
|
||||
#
|
||||
# Variant for use during development (empty help tables)
|
||||
#
|
||||
# Creation:
|
||||
# 2007-08-25 mleich Add this test as compensation for the
|
||||
# checks removed within datadict_master.inc.
|
||||
#
|
||||
|
||||
let $c_help_category= `SELECT COUNT(*) FROM mysql.help_category`;
|
||||
let $c_help_keyword= `SELECT COUNT(*) FROM mysql.help_keyword`;
|
||||
let $c_help_relation= `SELECT COUNT(*) FROM mysql.help_relation`;
|
||||
let $c_help_topic= `SELECT COUNT(*) FROM mysql.help_topic`;
|
||||
if (`SELECT $c_help_category + $c_help_keyword + $c_help_relation
|
||||
+ $c_help_topic > 0`)
|
||||
{
|
||||
--skip # Test requires empty help tables = Development test configuration
|
||||
}
|
||||
|
||||
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
|
||||
SELECT * FROM INFORMATION_SCHEMA.TABLES
|
||||
WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';
|
||||
SELECT * FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';
|
@ -3,5 +3,9 @@
|
||||
--source include/have_innodb.inc
|
||||
|
||||
let $engine_type= innodb;
|
||||
# $OTHER_ENGINE_TYPE must be
|
||||
# - <> $engine_type
|
||||
# - all time available like MyISAM or MEMORY
|
||||
let $OTHER_ENGINE_TYPE= MEMORY;
|
||||
|
||||
--source suite/funcs_1/datadict/datadict_master.inc
|
||||
|
@ -1,5 +1,9 @@
|
||||
#### suite/funcs_1/t/datadict_memory.test
|
||||
#
|
||||
let $engine_type= memory;
|
||||
# $OTHER_ENGINE_TYPE must be
|
||||
# - <> $engine_type
|
||||
# - all time available like MyISAM or MEMORY
|
||||
let $OTHER_ENGINE_TYPE= MyISAM;
|
||||
|
||||
--source suite/funcs_1/datadict/datadict_master.inc
|
||||
|
@ -1,5 +1,10 @@
|
||||
#### suite/funcs_1/t/datadict_myisam.test
|
||||
#
|
||||
|
||||
let $engine_type= myisam;
|
||||
# $OTHER_ENGINE_TYPE must be
|
||||
# - <> $engine_type
|
||||
# - all time available like MyISAM or MEMORY
|
||||
let $OTHER_ENGINE_TYPE= MEMORY;
|
||||
|
||||
--source suite/funcs_1/datadict/datadict_master.inc
|
||||
|
Reference in New Issue
Block a user