mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Temporarily backout the Information Schema System Table Information Schema
interface related change, will put back in once gain approval.
This commit is contained in:
@ -109,20 +109,13 @@ Database: information_schema
|
|||||||
| TRIGGERS |
|
| TRIGGERS |
|
||||||
| USER_PRIVILEGES |
|
| USER_PRIVILEGES |
|
||||||
| VIEWS |
|
| VIEWS |
|
||||||
| INNODB_SYS_FIELDS |
|
|
||||||
| INNODB_TRX |
|
|
||||||
| INNODB_SYS_INDEXES |
|
|
||||||
| INNODB_LOCK_WAITS |
|
|
||||||
| INNODB_SYS_TABLESTATS |
|
|
||||||
| INNODB_CMP |
|
|
||||||
| INNODB_SYS_COLUMNS |
|
|
||||||
| INNODB_CMP_RESET |
|
| INNODB_CMP_RESET |
|
||||||
| INNODB_SYS_FOREIGN_COLS |
|
| INNODB_TRX |
|
||||||
| INNODB_LOCKS |
|
|
||||||
| INNODB_CMPMEM_RESET |
|
| INNODB_CMPMEM_RESET |
|
||||||
|
| INNODB_LOCK_WAITS |
|
||||||
| INNODB_CMPMEM |
|
| INNODB_CMPMEM |
|
||||||
| INNODB_SYS_FOREIGN |
|
| INNODB_CMP |
|
||||||
| INNODB_SYS_TABLES |
|
| INNODB_LOCKS |
|
||||||
+---------------------------------------+
|
+---------------------------------------+
|
||||||
Database: INFORMATION_SCHEMA
|
Database: INFORMATION_SCHEMA
|
||||||
+---------------------------------------+
|
+---------------------------------------+
|
||||||
@ -158,20 +151,13 @@ Database: INFORMATION_SCHEMA
|
|||||||
| TRIGGERS |
|
| TRIGGERS |
|
||||||
| USER_PRIVILEGES |
|
| USER_PRIVILEGES |
|
||||||
| VIEWS |
|
| VIEWS |
|
||||||
| INNODB_SYS_FIELDS |
|
|
||||||
| INNODB_TRX |
|
|
||||||
| INNODB_SYS_INDEXES |
|
|
||||||
| INNODB_LOCK_WAITS |
|
|
||||||
| INNODB_SYS_TABLESTATS |
|
|
||||||
| INNODB_CMP |
|
|
||||||
| INNODB_SYS_COLUMNS |
|
|
||||||
| INNODB_CMP_RESET |
|
| INNODB_CMP_RESET |
|
||||||
| INNODB_SYS_FOREIGN_COLS |
|
| INNODB_TRX |
|
||||||
| INNODB_LOCKS |
|
|
||||||
| INNODB_CMPMEM_RESET |
|
| INNODB_CMPMEM_RESET |
|
||||||
|
| INNODB_LOCK_WAITS |
|
||||||
| INNODB_CMPMEM |
|
| INNODB_CMPMEM |
|
||||||
| INNODB_SYS_FOREIGN |
|
| INNODB_CMP |
|
||||||
| INNODB_SYS_TABLES |
|
| INNODB_LOCKS |
|
||||||
+---------------------------------------+
|
+---------------------------------------+
|
||||||
Wildcard: inf_rmation_schema
|
Wildcard: inf_rmation_schema
|
||||||
+--------------------+
|
+--------------------+
|
||||||
|
@ -1,110 +0,0 @@
|
|||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
|
|
||||||
TABLE_ID NAME FLAG N_COLS SPACE
|
|
||||||
11 SYS_FOREIGN 0 7 0
|
|
||||||
12 SYS_FOREIGN_COLS 0 7 0
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
|
|
||||||
INDEX_ID NAME TABLE_ID TYPE N_FIELDS PAGE_NO SPACE
|
|
||||||
11 ID_IND 11 3 1 302 0
|
|
||||||
12 FOR_IND 11 0 1 303 0
|
|
||||||
13 REF_IND 11 0 1 304 0
|
|
||||||
14 ID_IND 12 3 2 305 0
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS;
|
|
||||||
TABLE_ID NAME POS MTYPE PRTYPE LEN
|
|
||||||
11 ID 0 1 524292 0
|
|
||||||
11 FOR_NAME 1 1 524292 0
|
|
||||||
11 REF_NAME 2 1 524292 0
|
|
||||||
11 N_COLS 3 6 0 4
|
|
||||||
12 ID 0 1 524292 0
|
|
||||||
12 POS 1 6 0 4
|
|
||||||
12 FOR_COL_NAME 2 1 524292 0
|
|
||||||
12 REF_COL_NAME 3 1 524292 0
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FIELDS;
|
|
||||||
INDEX_ID NAME POS
|
|
||||||
11 ID 0
|
|
||||||
12 FOR_NAME 0
|
|
||||||
13 REF_NAME 0
|
|
||||||
14 ID 0
|
|
||||||
14 POS 1
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
|
|
||||||
ID FOR_NAME REF_NAME N_COLS TYPE
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
|
|
||||||
ID FOR_COL_NAME REF_COL_NAME POS
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS;
|
|
||||||
TABLE_ID NAME STATS_INITIALIZED NUM_ROWS CLUST_INDEX_SIZE OTHER_INDEX_SIZE MODIFIED_COUNTER AUTOINC MYSQL_HANDLES_OPENED
|
|
||||||
11 SYS_FOREIGN Uninitialized 0 0 0 0 0 0
|
|
||||||
12 SYS_FOREIGN_COLS Uninitialized 0 0 0 0 0 0
|
|
||||||
CREATE TABLE parent (id INT NOT NULL,
|
|
||||||
PRIMARY KEY (id)) ENGINE=INNODB;
|
|
||||||
CREATE TABLE child (id INT, parent_id INT,
|
|
||||||
INDEX par_ind (parent_id),
|
|
||||||
CONSTRAINT constraint_test
|
|
||||||
FOREIGN KEY (parent_id) REFERENCES parent(id)
|
|
||||||
ON DELETE CASCADE) ENGINE=INNODB;
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
|
|
||||||
ID FOR_NAME REF_NAME N_COLS TYPE
|
|
||||||
test/constraint_test test/child test/parent 1 1
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
|
|
||||||
ID FOR_COL_NAME REF_COL_NAME POS
|
|
||||||
test/constraint_test parent_id id 0
|
|
||||||
INSERT INTO parent VALUES(1);
|
|
||||||
SELECT name, num_rows, mysql_handles_opened
|
|
||||||
FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
|
|
||||||
WHERE name LIKE "%parent";
|
|
||||||
name num_rows mysql_handles_opened
|
|
||||||
test/parent 1 1
|
|
||||||
SELECT NAME, FLAG, N_COLS, SPACE FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
|
|
||||||
NAME FLAG N_COLS SPACE
|
|
||||||
SYS_FOREIGN 0 7 0
|
|
||||||
SYS_FOREIGN_COLS 0 7 0
|
|
||||||
test/child 1 5 0
|
|
||||||
test/parent 1 4 0
|
|
||||||
SELECT name, n_fields
|
|
||||||
from INFORMATION_SCHEMA.INNODB_SYS_INDEXES
|
|
||||||
WHERE table_id In (SELECT table_id from
|
|
||||||
INFORMATION_SCHEMA.INNODB_SYS_TABLES
|
|
||||||
WHERE name LIKE "%parent%");
|
|
||||||
name n_fields
|
|
||||||
PRIMARY 1
|
|
||||||
SELECT name, n_fields
|
|
||||||
from INFORMATION_SCHEMA.INNODB_SYS_INDEXES
|
|
||||||
WHERE table_id In (SELECT table_id from
|
|
||||||
INFORMATION_SCHEMA.INNODB_SYS_TABLES
|
|
||||||
WHERE name LIKE "%child%");
|
|
||||||
name n_fields
|
|
||||||
GEN_CLUST_INDEX 0
|
|
||||||
par_ind 1
|
|
||||||
SELECT name, pos, mtype, len
|
|
||||||
from INFORMATION_SCHEMA.INNODB_SYS_COLUMNS
|
|
||||||
WHERE table_id In (SELECT table_id from
|
|
||||||
INFORMATION_SCHEMA.INNODB_SYS_TABLES
|
|
||||||
WHERE name LIKE "%child%");
|
|
||||||
name pos mtype len
|
|
||||||
id 0 6 4
|
|
||||||
parent_id 1 6 4
|
|
||||||
DROP TABLE child;
|
|
||||||
DROP TABLE parent;
|
|
||||||
CREATE TABLE parent (id INT NOT NULL, newid INT NOT NULL,
|
|
||||||
PRIMARY KEY (id, newid)) ENGINE=INNODB;
|
|
||||||
CREATE TABLE child (id INT, parent_id INT,
|
|
||||||
INDEX par_ind (parent_id),
|
|
||||||
CONSTRAINT constraint_test
|
|
||||||
FOREIGN KEY (id, parent_id) REFERENCES parent(id, newid)
|
|
||||||
ON DELETE CASCADE) ENGINE=INNODB;
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
|
|
||||||
ID FOR_NAME REF_NAME N_COLS TYPE
|
|
||||||
test/constraint_test test/child test/parent 2 1
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
|
|
||||||
ID FOR_COL_NAME REF_COL_NAME POS
|
|
||||||
test/constraint_test id id 0
|
|
||||||
test/constraint_test parent_id newid 1
|
|
||||||
INSERT INTO parent VALUES(1, 9);
|
|
||||||
SELECT * FROM parent WHERE id IN (SELECT id FROM parent);
|
|
||||||
id newid
|
|
||||||
1 9
|
|
||||||
SELECT name, num_rows, mysql_handles_opened
|
|
||||||
FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
|
|
||||||
WHERE name LIKE "%parent";
|
|
||||||
name num_rows mysql_handles_opened
|
|
||||||
test/parent 1 2
|
|
||||||
DROP TABLE child;
|
|
||||||
DROP TABLE parent;
|
|
@ -1,3 +0,0 @@
|
|||||||
--default-storage-engine=MyISAM
|
|
||||||
--innodb-strict-mode=0
|
|
||||||
--innodb-file-per-table=0
|
|
@ -1,94 +0,0 @@
|
|||||||
# This is the test for Information Schema System Table View
|
|
||||||
# that displays the InnoDB system table content through
|
|
||||||
# information schema tables.
|
|
||||||
|
|
||||||
--source include/have_innodb.inc
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FIELDS;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS;
|
|
||||||
|
|
||||||
# Create a foreign key constraint, and verify the information
|
|
||||||
# in INFORMATION_SCHEMA.INNODB_SYS_FOREIGN and
|
|
||||||
# INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS
|
|
||||||
CREATE TABLE parent (id INT NOT NULL,
|
|
||||||
PRIMARY KEY (id)) ENGINE=INNODB;
|
|
||||||
|
|
||||||
CREATE TABLE child (id INT, parent_id INT,
|
|
||||||
INDEX par_ind (parent_id),
|
|
||||||
CONSTRAINT constraint_test
|
|
||||||
FOREIGN KEY (parent_id) REFERENCES parent(id)
|
|
||||||
ON DELETE CASCADE) ENGINE=INNODB;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
|
|
||||||
|
|
||||||
# Insert a row in the table "parent", and see whether that reflected in
|
|
||||||
# INNODB_SYS_TABLESTATS
|
|
||||||
INSERT INTO parent VALUES(1);
|
|
||||||
|
|
||||||
SELECT name, num_rows, mysql_handles_opened
|
|
||||||
FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
|
|
||||||
WHERE name LIKE "%parent";
|
|
||||||
|
|
||||||
SELECT NAME, FLAG, N_COLS, SPACE FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
|
|
||||||
|
|
||||||
SELECT name, n_fields
|
|
||||||
from INFORMATION_SCHEMA.INNODB_SYS_INDEXES
|
|
||||||
WHERE table_id In (SELECT table_id from
|
|
||||||
INFORMATION_SCHEMA.INNODB_SYS_TABLES
|
|
||||||
WHERE name LIKE "%parent%");
|
|
||||||
|
|
||||||
SELECT name, n_fields
|
|
||||||
from INFORMATION_SCHEMA.INNODB_SYS_INDEXES
|
|
||||||
WHERE table_id In (SELECT table_id from
|
|
||||||
INFORMATION_SCHEMA.INNODB_SYS_TABLES
|
|
||||||
WHERE name LIKE "%child%");
|
|
||||||
|
|
||||||
SELECT name, pos, mtype, len
|
|
||||||
from INFORMATION_SCHEMA.INNODB_SYS_COLUMNS
|
|
||||||
WHERE table_id In (SELECT table_id from
|
|
||||||
INFORMATION_SCHEMA.INNODB_SYS_TABLES
|
|
||||||
WHERE name LIKE "%child%");
|
|
||||||
|
|
||||||
DROP TABLE child;
|
|
||||||
|
|
||||||
DROP TABLE parent;
|
|
||||||
|
|
||||||
# Create table with 2 columns in the foreign key constraint
|
|
||||||
CREATE TABLE parent (id INT NOT NULL, newid INT NOT NULL,
|
|
||||||
PRIMARY KEY (id, newid)) ENGINE=INNODB;
|
|
||||||
|
|
||||||
CREATE TABLE child (id INT, parent_id INT,
|
|
||||||
INDEX par_ind (parent_id),
|
|
||||||
CONSTRAINT constraint_test
|
|
||||||
FOREIGN KEY (id, parent_id) REFERENCES parent(id, newid)
|
|
||||||
ON DELETE CASCADE) ENGINE=INNODB;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
|
|
||||||
|
|
||||||
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
|
|
||||||
|
|
||||||
INSERT INTO parent VALUES(1, 9);
|
|
||||||
|
|
||||||
# Nested query will open the table handle twice
|
|
||||||
SELECT * FROM parent WHERE id IN (SELECT id FROM parent);
|
|
||||||
|
|
||||||
SELECT name, num_rows, mysql_handles_opened
|
|
||||||
FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
|
|
||||||
WHERE name LIKE "%parent";
|
|
||||||
|
|
||||||
DROP TABLE child;
|
|
||||||
|
|
||||||
DROP TABLE parent;
|
|
@ -11177,15 +11177,7 @@ i_s_innodb_lock_waits,
|
|||||||
i_s_innodb_cmp,
|
i_s_innodb_cmp,
|
||||||
i_s_innodb_cmp_reset,
|
i_s_innodb_cmp_reset,
|
||||||
i_s_innodb_cmpmem,
|
i_s_innodb_cmpmem,
|
||||||
i_s_innodb_cmpmem_reset,
|
i_s_innodb_cmpmem_reset
|
||||||
i_s_innodb_sys_tables,
|
|
||||||
i_s_innodb_sys_tablestats,
|
|
||||||
i_s_innodb_sys_indexes,
|
|
||||||
i_s_innodb_sys_columns,
|
|
||||||
i_s_innodb_sys_fields,
|
|
||||||
i_s_innodb_sys_foreign,
|
|
||||||
i_s_innodb_sys_foreign_cols
|
|
||||||
|
|
||||||
mysql_declare_plugin_end;
|
mysql_declare_plugin_end;
|
||||||
|
|
||||||
/** @brief Initialize the default value of innodb_commit_concurrency.
|
/** @brief Initialize the default value of innodb_commit_concurrency.
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -33,12 +33,5 @@ extern struct st_mysql_plugin i_s_innodb_cmp;
|
|||||||
extern struct st_mysql_plugin i_s_innodb_cmp_reset;
|
extern struct st_mysql_plugin i_s_innodb_cmp_reset;
|
||||||
extern struct st_mysql_plugin i_s_innodb_cmpmem;
|
extern struct st_mysql_plugin i_s_innodb_cmpmem;
|
||||||
extern struct st_mysql_plugin i_s_innodb_cmpmem_reset;
|
extern struct st_mysql_plugin i_s_innodb_cmpmem_reset;
|
||||||
extern struct st_mysql_plugin i_s_innodb_sys_tables;
|
|
||||||
extern struct st_mysql_plugin i_s_innodb_sys_tablestats;
|
|
||||||
extern struct st_mysql_plugin i_s_innodb_sys_indexes;
|
|
||||||
extern struct st_mysql_plugin i_s_innodb_sys_columns;
|
|
||||||
extern struct st_mysql_plugin i_s_innodb_sys_fields;
|
|
||||||
extern struct st_mysql_plugin i_s_innodb_sys_foreign;
|
|
||||||
extern struct st_mysql_plugin i_s_innodb_sys_foreign_cols;
|
|
||||||
|
|
||||||
#endif /* i_s_h */
|
#endif /* i_s_h */
|
||||||
|
Reference in New Issue
Block a user