mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
633cc34ca7
ChangeSet@1.2561, 2008-03-07 17:44:03+01:00, mleich@five.local.lan +132 -0 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 into five.local.lan:/work/merge/mysql-5.1-funcs_1 MERGE: 1.1810.3473.24 ChangeSet@1.1810.3473.24, 2008-03-07 WL#4203 Reorganize and fix the data dictionary tests of testsuite funcs_1 1. Adjustment of expected results to modified server properties 2. Add some tests of information_schema views 3. Minor corrections and improvements BitKeeper/deleted/.del-ndb__datadict.result: Delete: mysql-test/suite/funcs_1/r/ndb__datadict.result BitKeeper/deleted/.del-ndb__datadict.test: Delete: mysql-test/suite/funcs_1/t/ndb__datadict.test BitKeeper/deleted/.del-ndb__load.test: Delete: mysql-test/suite/funcs_1/t/ndb__load.test BitKeeper/deleted/.del-ndb__load.result: Delete: mysql-test/suite/funcs_1/r/ndb__load.result mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Make the results independend of amount of preceding tests. mysql-test/suite/funcs_1/datadict/processlist_val.inc: Correct the cleanup mysql-test/suite/funcs_1/r/charset_collation_1.result: Updated results mysql-test/suite/funcs_1/r/charset_collation_2.result: Updated results mysql-test/suite/funcs_1/r/innodb_func_view.result: Updated results mysql-test/suite/funcs_1/r/innodb_storedproc.result: Updated results mysql-test/suite/funcs_1/r/is_basics_mixed.result: Updated results mysql-test/suite/funcs_1/r/is_character_sets.result: Updated results mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result: Updated results mysql-test/suite/funcs_1/r/is_collations.result: Updated results mysql-test/suite/funcs_1/r/is_column_privileges.result: Updated results mysql-test/suite/funcs_1/r/is_columns.result: Updated results mysql-test/suite/funcs_1/r/is_columns_innodb.result: Updated results mysql-test/suite/funcs_1/r/is_columns_is.result: Updated results mysql-test/suite/funcs_1/r/is_columns_memory.result: Updated results mysql-test/suite/funcs_1/r/is_columns_myisam.result: Updated results mysql-test/suite/funcs_1/r/is_columns_mysql.result: Updated results mysql-test/suite/funcs_1/r/is_key_column_usage.result: Updated results mysql-test/suite/funcs_1/r/is_routines.result: Updated results mysql-test/suite/funcs_1/r/is_schema_privileges.result: Updated results mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result: Updated results mysql-test/suite/funcs_1/r/is_schemata.result: Updated results mysql-test/suite/funcs_1/r/is_statistics.result: Updated results mysql-test/suite/funcs_1/r/is_statistics_mysql.result: Updated results mysql-test/suite/funcs_1/r/is_table_constraints.result: Updated results mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result: Updated results mysql-test/suite/funcs_1/r/is_table_privileges.result: Updated results mysql-test/suite/funcs_1/r/is_tables.result: Updated results mysql-test/suite/funcs_1/r/is_tables_is.result: Updated results mysql-test/suite/funcs_1/r/is_tables_mysql.result: Updated results mysql-test/suite/funcs_1/r/is_tables_ndb.result: Updated results mysql-test/suite/funcs_1/r/is_triggers.result: Updated results mysql-test/suite/funcs_1/r/is_user_privileges.result: Updated results mysql-test/suite/funcs_1/r/is_views.result: Updated results mysql-test/suite/funcs_1/r/memory_func_view.result: Updated results mysql-test/suite/funcs_1/r/memory_storedproc.result: Updated results mysql-test/suite/funcs_1/r/myisam_func_view.result: Updated results mysql-test/suite/funcs_1/r/myisam_storedproc.result: Updated results mysql-test/suite/funcs_1/r/myisam_views.result: Updated results mysql-test/suite/funcs_1/r/ndb_func_view.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_02.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_03.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_07.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_08.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_10.result: Updated results mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Updated results mysql-test/suite/funcs_1/r/processlist_priv_ps.result: Updated results mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Updated results mysql-test/suite/funcs_1/r/processlist_val_ps.result: Updated results mysql-test/suite/funcs_1/storedproc/storedproc_master.inc: Set subtest checking a no more reserved keyword to comment. mysql-test/suite/funcs_1/t/disabled.def: ndb__datadict is dropped. The checks are done in other scripts. mysql-test/suite/funcs_1/t/is_routines.test: Correction of comment mysql-test/suite/funcs_1/t/is_triggers.test: Adjustment to changes in privilege system between MySQL 5.0 and 5.1. mysql-test/suite/funcs_1/t/is_views.test: Correction of comment. mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test: Correction of comment. mysql-test/suite/funcs_1/t/processlist_priv_ps.test: Correction of comment. mysql-test/suite/funcs_1/t/processlist_val_no_prot.test: Correction of comment. mysql-test/suite/funcs_1/t/processlist_val_ps.test: Correction of comment. mysql-test/suite/funcs_1/r/is_engines.result: Expected results mysql-test/suite/funcs_1/r/is_engines_archive.result: Expected results mysql-test/suite/funcs_1/r/is_engines_blackhole.result: Expected results mysql-test/suite/funcs_1/r/is_engines_csv.result: Expected results mysql-test/suite/funcs_1/r/is_engines_federated.result: Expected results mysql-test/suite/funcs_1/r/is_engines_innodb.result: Expected results mysql-test/suite/funcs_1/r/is_engines_memory.result: Expected results mysql-test/suite/funcs_1/r/is_engines_merge.result: Expected results mysql-test/suite/funcs_1/r/is_engines_myisam.result: Expected results mysql-test/suite/funcs_1/t/is_engines.test: Test of information_schema.engines mysql-test/suite/funcs_1/t/is_engines_archive.test: Test of information_schema.engines Variant for ARCHIVE mysql-test/suite/funcs_1/t/is_engines_blackhole.test: Test of information_schema.engines Variant for BLACKHOLE mysql-test/suite/funcs_1/t/is_engines_csv.test: Test of information_schema.engines Variant for CSV mysql-test/suite/funcs_1/t/is_engines_federated.test: Test of information_schema.engines Variant for FEDERATED mysql-test/suite/funcs_1/t/is_engines_innodb.test: Test of information_schema.engines Variant for InnoDB mysql-test/suite/funcs_1/t/is_engines_memory.test: Test of information_schema.engines Variant for MEMORY mysql-test/suite/funcs_1/t/is_engines_merge.test: Test of information_schema.engines Variant for MERGGE mysql-test/suite/funcs_1/t/is_engines_myisam.test: Test of information_schema.engines Variant for MyISAM mysql-test/suite/funcs_1/t/is_engines_ndb.test: Test of information_schema.engines Variant for NDB mysql-test/suite/funcs_1/t/is_events.test: Test for information_schema.events mysql-test/suite/funcs_1/r/is_engines_ndb.result: Expected results mysql-test/suite/funcs_1/r/is_events.result: Expected results
65 lines
4.5 KiB
Text
65 lines
4.5 KiB
Text
DROP DATABASE IF EXISTS db_datadict;
|
|
CREATE DATABASE db_datadict;
|
|
DROP USER testuser1@localhost;
|
|
CREATE USER testuser1@localhost;
|
|
GRANT SELECT ON db_datadict.* TO testuser1@localhost;
|
|
SELECT * FROM information_schema.statistics
|
|
WHERE table_schema = 'mysql'
|
|
ORDER BY table_schema, table_name, index_name, seq_in_index, column_name;
|
|
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 #CARD# NULL NULL BTREE
|
|
NULL mysql columns_priv 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE
|
|
NULL mysql columns_priv 0 mysql PRIMARY 3 User A #CARD# NULL NULL BTREE
|
|
NULL mysql columns_priv 0 mysql PRIMARY 4 Table_name A #CARD# NULL NULL BTREE
|
|
NULL mysql columns_priv 0 mysql PRIMARY 5 Column_name A #CARD# NULL NULL BTREE
|
|
NULL mysql db 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE
|
|
NULL mysql db 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE
|
|
NULL mysql db 0 mysql PRIMARY 3 User A #CARD# NULL NULL BTREE
|
|
NULL mysql db 1 mysql User 1 User A #CARD# NULL NULL BTREE
|
|
NULL mysql event 0 mysql PRIMARY 1 db A #CARD# NULL NULL BTREE
|
|
NULL mysql event 0 mysql PRIMARY 2 name A #CARD# NULL NULL BTREE
|
|
NULL mysql func 0 mysql PRIMARY 1 name A #CARD# NULL NULL BTREE
|
|
NULL mysql help_category 0 mysql name 1 name A #CARD# NULL NULL BTREE
|
|
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A #CARD# NULL NULL BTREE
|
|
NULL mysql help_keyword 0 mysql name 1 name A #CARD# NULL NULL BTREE
|
|
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A #CARD# NULL NULL BTREE
|
|
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A #CARD# NULL NULL BTREE
|
|
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A #CARD# NULL NULL BTREE
|
|
NULL mysql help_topic 0 mysql name 1 name A #CARD# NULL NULL BTREE
|
|
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A #CARD# NULL NULL BTREE
|
|
NULL mysql host 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE
|
|
NULL mysql host 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE
|
|
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A #CARD# NULL NULL BTREE
|
|
NULL mysql plugin 0 mysql PRIMARY 1 name A #CARD# NULL NULL BTREE
|
|
NULL mysql proc 0 mysql PRIMARY 1 db A #CARD# NULL NULL BTREE
|
|
NULL mysql proc 0 mysql PRIMARY 2 name A #CARD# NULL NULL BTREE
|
|
NULL mysql proc 0 mysql PRIMARY 3 type A #CARD# NULL NULL BTREE
|
|
NULL mysql procs_priv 1 mysql Grantor 1 Grantor A #CARD# NULL NULL BTREE
|
|
NULL mysql procs_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE
|
|
NULL mysql procs_priv 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE
|
|
NULL mysql procs_priv 0 mysql PRIMARY 3 User A #CARD# NULL NULL BTREE
|
|
NULL mysql procs_priv 0 mysql PRIMARY 4 Routine_name A #CARD# NULL NULL BTREE
|
|
NULL mysql procs_priv 0 mysql PRIMARY 5 Routine_type A #CARD# NULL NULL BTREE
|
|
NULL mysql servers 0 mysql PRIMARY 1 Server_name A #CARD# NULL NULL BTREE
|
|
NULL mysql tables_priv 1 mysql Grantor 1 Grantor A #CARD# NULL NULL BTREE
|
|
NULL mysql tables_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE
|
|
NULL mysql tables_priv 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE
|
|
NULL mysql tables_priv 0 mysql PRIMARY 3 User A #CARD# NULL NULL BTREE
|
|
NULL mysql tables_priv 0 mysql PRIMARY 4 Table_name A #CARD# NULL NULL BTREE
|
|
NULL mysql time_zone 0 mysql PRIMARY 1 Time_zone_id A #CARD# NULL NULL BTREE
|
|
NULL mysql time_zone_leap_second 0 mysql PRIMARY 1 Transition_time A #CARD# NULL NULL BTREE
|
|
NULL mysql time_zone_name 0 mysql PRIMARY 1 Name A #CARD# NULL NULL BTREE
|
|
NULL mysql time_zone_transition 0 mysql PRIMARY 1 Time_zone_id A #CARD# NULL NULL BTREE
|
|
NULL mysql time_zone_transition 0 mysql PRIMARY 2 Transition_time A #CARD# NULL NULL BTREE
|
|
NULL mysql time_zone_transition_type 0 mysql PRIMARY 1 Time_zone_id A #CARD# NULL NULL BTREE
|
|
NULL mysql time_zone_transition_type 0 mysql PRIMARY 2 Transition_type_id A #CARD# NULL NULL BTREE
|
|
NULL mysql user 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE
|
|
NULL mysql user 0 mysql PRIMARY 2 User A #CARD# NULL NULL BTREE
|
|
# Establish connection testuser1 (user=testuser1)
|
|
SELECT * FROM information_schema.statistics
|
|
WHERE table_schema = 'mysql'
|
|
ORDER BY table_schema, table_name, index_name, seq_in_index, column_name;
|
|
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
|
|
# Switch to connection default and close connection testuser1
|
|
DROP USER testuser1@localhost;
|
|
DROP DATABASE db_datadict;
|