mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Post merge fixes after
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
This commit is contained in:
@@ -33,46 +33,46 @@ TABLE_SCHEMA varchar(64) NO
|
||||
TABLE_NAME varchar(64) NO
|
||||
TABLE_TYPE varchar(64) NO
|
||||
ENGINE varchar(64) YES NULL
|
||||
VERSION bigint(21) YES NULL
|
||||
VERSION bigint(21) unsigned YES NULL
|
||||
ROW_FORMAT varchar(10) YES NULL
|
||||
TABLE_ROWS bigint(21) YES NULL
|
||||
AVG_ROW_LENGTH bigint(21) YES NULL
|
||||
DATA_LENGTH bigint(21) YES NULL
|
||||
MAX_DATA_LENGTH bigint(21) YES NULL
|
||||
INDEX_LENGTH bigint(21) YES NULL
|
||||
DATA_FREE bigint(21) YES NULL
|
||||
AUTO_INCREMENT bigint(21) YES NULL
|
||||
TABLE_ROWS bigint(21) unsigned YES NULL
|
||||
AVG_ROW_LENGTH bigint(21) unsigned YES NULL
|
||||
DATA_LENGTH bigint(21) unsigned YES NULL
|
||||
MAX_DATA_LENGTH bigint(21) unsigned YES NULL
|
||||
INDEX_LENGTH bigint(21) unsigned YES NULL
|
||||
DATA_FREE bigint(21) unsigned YES NULL
|
||||
AUTO_INCREMENT bigint(21) unsigned YES NULL
|
||||
CREATE_TIME datetime YES NULL
|
||||
UPDATE_TIME datetime YES NULL
|
||||
CHECK_TIME datetime YES NULL
|
||||
TABLE_COLLATION varchar(64) YES NULL
|
||||
CHECKSUM bigint(21) YES NULL
|
||||
CHECKSUM bigint(21) unsigned YES NULL
|
||||
CREATE_OPTIONS varchar(255) YES NULL
|
||||
TABLE_COMMENT varchar(80) NO
|
||||
SHOW CREATE TABLE information_schema.TABLES;
|
||||
Table Create Table
|
||||
TABLES CREATE TEMPORARY TABLE `TABLES` (
|
||||
`TABLE_CATALOG` varchar(512) default NULL,
|
||||
`TABLE_SCHEMA` varchar(64) NOT NULL default '',
|
||||
`TABLE_NAME` varchar(64) NOT NULL default '',
|
||||
`TABLE_TYPE` varchar(64) NOT NULL default '',
|
||||
`ENGINE` varchar(64) default NULL,
|
||||
`VERSION` bigint(21) default NULL,
|
||||
`ROW_FORMAT` varchar(10) default NULL,
|
||||
`TABLE_ROWS` bigint(21) default NULL,
|
||||
`AVG_ROW_LENGTH` bigint(21) default NULL,
|
||||
`DATA_LENGTH` bigint(21) default NULL,
|
||||
`MAX_DATA_LENGTH` bigint(21) default NULL,
|
||||
`INDEX_LENGTH` bigint(21) default NULL,
|
||||
`DATA_FREE` bigint(21) default NULL,
|
||||
`AUTO_INCREMENT` bigint(21) default NULL,
|
||||
`CREATE_TIME` datetime default NULL,
|
||||
`UPDATE_TIME` datetime default NULL,
|
||||
`CHECK_TIME` datetime default NULL,
|
||||
`TABLE_COLLATION` varchar(64) default NULL,
|
||||
`CHECKSUM` bigint(21) default NULL,
|
||||
`CREATE_OPTIONS` varchar(255) default NULL,
|
||||
`TABLE_COMMENT` varchar(80) NOT NULL default ''
|
||||
`TABLE_CATALOG` varchar(512) DEFAULT NULL,
|
||||
`TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
|
||||
`TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
|
||||
`TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
|
||||
`ENGINE` varchar(64) DEFAULT NULL,
|
||||
`VERSION` bigint(21) unsigned DEFAULT NULL,
|
||||
`ROW_FORMAT` varchar(10) DEFAULT NULL,
|
||||
`TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
|
||||
`AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
|
||||
`DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
|
||||
`MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
|
||||
`INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
|
||||
`DATA_FREE` bigint(21) unsigned DEFAULT NULL,
|
||||
`AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
|
||||
`CREATE_TIME` datetime DEFAULT NULL,
|
||||
`UPDATE_TIME` datetime DEFAULT NULL,
|
||||
`CHECK_TIME` datetime DEFAULT NULL,
|
||||
`TABLE_COLLATION` varchar(64) DEFAULT NULL,
|
||||
`CHECKSUM` bigint(21) unsigned DEFAULT NULL,
|
||||
`CREATE_OPTIONS` varchar(255) DEFAULT NULL,
|
||||
`TABLE_COMMENT` varchar(80) NOT NULL DEFAULT ''
|
||||
) ENGINE=MEMORY DEFAULT CHARSET=utf8
|
||||
SHOW COLUMNS FROM information_schema.TABLES;
|
||||
Field Type Null Key Default Extra
|
||||
@@ -81,20 +81,20 @@ TABLE_SCHEMA varchar(64) NO
|
||||
TABLE_NAME varchar(64) NO
|
||||
TABLE_TYPE varchar(64) NO
|
||||
ENGINE varchar(64) YES NULL
|
||||
VERSION bigint(21) YES NULL
|
||||
VERSION bigint(21) unsigned YES NULL
|
||||
ROW_FORMAT varchar(10) YES NULL
|
||||
TABLE_ROWS bigint(21) YES NULL
|
||||
AVG_ROW_LENGTH bigint(21) YES NULL
|
||||
DATA_LENGTH bigint(21) YES NULL
|
||||
MAX_DATA_LENGTH bigint(21) YES NULL
|
||||
INDEX_LENGTH bigint(21) YES NULL
|
||||
DATA_FREE bigint(21) YES NULL
|
||||
AUTO_INCREMENT bigint(21) YES NULL
|
||||
TABLE_ROWS bigint(21) unsigned YES NULL
|
||||
AVG_ROW_LENGTH bigint(21) unsigned YES NULL
|
||||
DATA_LENGTH bigint(21) unsigned YES NULL
|
||||
MAX_DATA_LENGTH bigint(21) unsigned YES NULL
|
||||
INDEX_LENGTH bigint(21) unsigned YES NULL
|
||||
DATA_FREE bigint(21) unsigned YES NULL
|
||||
AUTO_INCREMENT bigint(21) unsigned YES NULL
|
||||
CREATE_TIME datetime YES NULL
|
||||
UPDATE_TIME datetime YES NULL
|
||||
CHECK_TIME datetime YES NULL
|
||||
TABLE_COLLATION varchar(64) YES NULL
|
||||
CHECKSUM bigint(21) YES NULL
|
||||
CHECKSUM bigint(21) unsigned YES NULL
|
||||
CREATE_OPTIONS varchar(255) YES NULL
|
||||
TABLE_COMMENT varchar(80) NO
|
||||
SELECT table_catalog, table_schema, table_name
|
||||
|
||||
Reference in New Issue
Block a user