summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/information_schema.result11
-rw-r--r--mysql-test/r/information_schema_all_engines.result126
-rw-r--r--mysql-test/r/innodb.result2
-rw-r--r--mysql-test/r/innodb_no_mrricp.result2
-rw-r--r--mysql-test/r/openssl_1.result6
-rw-r--r--mysql-test/r/subselect4.result2
6 files changed, 125 insertions, 24 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 6694cf48109..886b6f4d7f3 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -56,9 +56,13 @@ FILES
GLOBAL_STATUS
GLOBAL_VARIABLES
INDEX_STATISTICS
+INNODB_BUFFER_PAGE
+INNODB_BUFFER_PAGE_LRU
INNODB_BUFFER_POOL_PAGES
INNODB_BUFFER_POOL_PAGES_BLOB
INNODB_BUFFER_POOL_PAGES_INDEX
+INNODB_BUFFER_POOL_STATS
+INNODB_CHANGED_PAGES
INNODB_CMP
INNODB_CMPMEM
INNODB_CMPMEM_RESET
@@ -94,7 +98,6 @@ USER_PRIVILEGES
USER_STATISTICS
VIEWS
XTRADB_ADMIN_COMMAND
-XTRADB_ENHANCEMENTS
columns_priv
db
event
@@ -872,6 +875,8 @@ COLUMNS TABLE_NAME select
COLUMN_PRIVILEGES TABLE_NAME select
FILES TABLE_NAME select
INDEX_STATISTICS TABLE_NAME select
+INNODB_BUFFER_PAGE TABLE_NAME select
+INNODB_BUFFER_PAGE_LRU TABLE_NAME select
INNODB_INDEX_STATS table_name select
INNODB_TABLE_STATS table_name select
KEY_COLUMN_USAGE TABLE_NAME select
@@ -1258,12 +1263,12 @@ DROP PROCEDURE p1;
DROP USER mysql_bug20230@localhost;
SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
MAX(table_name)
-XTRADB_ENHANCEMENTS
+XTRADB_ADMIN_COMMAND
SELECT table_name from information_schema.tables
WHERE table_name=(SELECT MAX(table_name)
FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'));
table_name
-XTRADB_ENHANCEMENTS
+XTRADB_ADMIN_COMMAND
DROP TABLE IF EXISTS bug23037;
DROP FUNCTION IF EXISTS get_value;
SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result
index c2bcbeb2315..43570c11434 100644
--- a/mysql-test/r/information_schema_all_engines.result
+++ b/mysql-test/r/information_schema_all_engines.result
@@ -51,8 +51,28 @@ TRIGGERS
USER_PRIVILEGES
USER_STATISTICS
VIEWS
+INNODB_BUFFER_POOL_PAGES
+PBXT_STATISTICS
+INNODB_CMP
+INNODB_RSEG
+INNODB_INDEX_STATS
+INNODB_BUFFER_POOL_PAGES_INDEX
XTRADB_ADMIN_COMMAND
-XTRADB_ENHANCEMENTS
+INNODB_TRX
+INNODB_SYS_TABLES
+INNODB_LOCK_WAITS
+INNODB_BUFFER_POOL_STATS
+INNODB_LOCKS
+INNODB_CMPMEM
+INNODB_TABLE_STATS
+INNODB_SYS_INDEXES
+INNODB_CMP_RESET
+INNODB_BUFFER_POOL_PAGES_BLOB
+INNODB_CMPMEM_RESET
+INNODB_BUFFER_PAGE
+INNODB_CHANGED_PAGES
+INNODB_SYS_STATS
+INNODB_BUFFER_PAGE_LRU
SELECT t.table_name, c1.column_name
FROM information_schema.tables t
INNER JOIN
@@ -118,8 +138,28 @@ TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER
VIEWS TABLE_SCHEMA
+INNODB_BUFFER_POOL_PAGES page_type
+PBXT_STATISTICS ID
+INNODB_CMP page_size
+INNODB_RSEG rseg_id
+INNODB_INDEX_STATS table_schema
+INNODB_BUFFER_POOL_PAGES_INDEX index_id
XTRADB_ADMIN_COMMAND result_message
-XTRADB_ENHANCEMENTS name
+INNODB_TRX trx_id
+INNODB_SYS_TABLES SCHEMA
+INNODB_LOCK_WAITS requesting_trx_id
+INNODB_BUFFER_POOL_STATS POOL_SIZE
+INNODB_LOCKS lock_id
+INNODB_CMPMEM page_size
+INNODB_TABLE_STATS table_schema
+INNODB_SYS_INDEXES TABLE_ID
+INNODB_CMP_RESET page_size
+INNODB_BUFFER_POOL_PAGES_BLOB space_id
+INNODB_CMPMEM_RESET page_size
+INNODB_BUFFER_PAGE BLOCK_ID
+INNODB_CHANGED_PAGES space_id
+INNODB_SYS_STATS INDEX_ID
+INNODB_BUFFER_PAGE_LRU LRU_POSITION
SELECT t.table_name, c1.column_name
FROM information_schema.tables t
INNER JOIN
@@ -185,8 +225,28 @@ TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER
VIEWS TABLE_SCHEMA
+INNODB_BUFFER_POOL_PAGES page_type
+PBXT_STATISTICS ID
+INNODB_CMP page_size
+INNODB_RSEG rseg_id
+INNODB_INDEX_STATS table_schema
+INNODB_BUFFER_POOL_PAGES_INDEX index_id
XTRADB_ADMIN_COMMAND result_message
-XTRADB_ENHANCEMENTS name
+INNODB_TRX trx_id
+INNODB_SYS_TABLES SCHEMA
+INNODB_LOCK_WAITS requesting_trx_id
+INNODB_BUFFER_POOL_STATS POOL_SIZE
+INNODB_LOCKS lock_id
+INNODB_CMPMEM page_size
+INNODB_TABLE_STATS table_schema
+INNODB_SYS_INDEXES TABLE_ID
+INNODB_CMP_RESET page_size
+INNODB_BUFFER_POOL_PAGES_BLOB space_id
+INNODB_CMPMEM_RESET page_size
+INNODB_BUFFER_PAGE BLOCK_ID
+INNODB_CHANGED_PAGES space_id
+INNODB_SYS_STATS INDEX_ID
+INNODB_BUFFER_PAGE_LRU LRU_POSITION
select 1 as f1 from information_schema.tables where "CHARACTER_SETS"=
(select cast(table_name as char) from information_schema.tables
order by table_name limit 1) limit 1;
@@ -220,9 +280,13 @@ FILES information_schema.FILES 1
GLOBAL_STATUS information_schema.GLOBAL_STATUS 1
GLOBAL_VARIABLES information_schema.GLOBAL_VARIABLES 1
INDEX_STATISTICS information_schema.INDEX_STATISTICS 1
+INNODB_BUFFER_PAGE information_schema.INNODB_BUFFER_PAGE 1
+INNODB_BUFFER_PAGE_LRU information_schema.INNODB_BUFFER_PAGE_LRU 1
INNODB_BUFFER_POOL_PAGES information_schema.INNODB_BUFFER_POOL_PAGES 1
INNODB_BUFFER_POOL_PAGES_BLOB information_schema.INNODB_BUFFER_POOL_PAGES_BLOB 1
INNODB_BUFFER_POOL_PAGES_INDEX information_schema.INNODB_BUFFER_POOL_PAGES_INDEX 1
+INNODB_BUFFER_POOL_STATS information_schema.INNODB_BUFFER_POOL_STATS 1
+INNODB_CHANGED_PAGES information_schema.INNODB_CHANGED_PAGES 1
INNODB_CMP information_schema.INNODB_CMP 1
INNODB_CMPMEM information_schema.INNODB_CMPMEM 1
INNODB_CMPMEM_RESET information_schema.INNODB_CMPMEM_RESET 1
@@ -258,10 +322,6 @@ TRIGGERS information_schema.TRIGGERS 1
USER_PRIVILEGES information_schema.USER_PRIVILEGES 1
USER_STATISTICS information_schema.USER_STATISTICS 1
VIEWS information_schema.VIEWS 1
-XTRADB_ENHANCEMENTS information_schema.XTRADB_ENHANCEMENTS 1
-+---------------------------------------+
-+---------------------------------------+
-+---------------------------------------+
Database: information_schema
| Tables |
| CHARACTER_SETS |
@@ -314,10 +374,28 @@ Database: information_schema
| USER_PRIVILEGES |
| USER_STATISTICS |
| VIEWS |
+| INNODB_BUFFER_POOL_PAGES |
+| PBXT_STATISTICS |
+| INNODB_CMP |
+| INNODB_RSEG |
+| INNODB_INDEX_STATS |
+| INNODB_BUFFER_POOL_PAGES_INDEX |
| XTRADB_ADMIN_COMMAND |
-| XTRADB_ENHANCEMENTS |
-+---------------------------------------+
-+---------------------------------------+
+| INNODB_TRX |
+| INNODB_SYS_TABLES |
+| INNODB_LOCK_WAITS |
+| INNODB_BUFFER_POOL_STATS |
+| INNODB_LOCKS |
+| INNODB_CMPMEM |
+| INNODB_TABLE_STATS |
+| INNODB_SYS_INDEXES |
+| INNODB_CMP_RESET |
+| INNODB_BUFFER_POOL_PAGES_BLOB |
+| INNODB_CMPMEM_RESET |
+| INNODB_BUFFER_PAGE |
+| INNODB_CHANGED_PAGES |
+| INNODB_SYS_STATS |
+| INNODB_BUFFER_PAGE_LRU |
+---------------------------------------+
Database: INFORMATION_SCHEMA
| Tables |
@@ -371,15 +449,33 @@ Database: INFORMATION_SCHEMA
| USER_PRIVILEGES |
| USER_STATISTICS |
| VIEWS |
+| INNODB_BUFFER_POOL_PAGES |
+| PBXT_STATISTICS |
+| INNODB_CMP |
+| INNODB_RSEG |
+| INNODB_INDEX_STATS |
+| INNODB_BUFFER_POOL_PAGES_INDEX |
| XTRADB_ADMIN_COMMAND |
-| XTRADB_ENHANCEMENTS |
-+--------------------+
-+--------------------+
-+--------------------+
+| INNODB_TRX |
+| INNODB_SYS_TABLES |
+| INNODB_LOCK_WAITS |
+| INNODB_BUFFER_POOL_STATS |
+| INNODB_LOCKS |
+| INNODB_CMPMEM |
+| INNODB_TABLE_STATS |
+| INNODB_SYS_INDEXES |
+| INNODB_CMP_RESET |
+| INNODB_BUFFER_POOL_PAGES_BLOB |
+| INNODB_CMPMEM_RESET |
+| INNODB_BUFFER_PAGE |
+| INNODB_CHANGED_PAGES |
+| INNODB_SYS_STATS |
+| INNODB_BUFFER_PAGE_LRU |
++---------------------------------------+
Wildcard: inf_rmation_schema
| Databases |
| information_schema |
SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
table_schema count(*)
-information_schema 52
+information_schema 50
mysql 22
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 9ab7ed4eec7..798aea24401 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -3203,7 +3203,7 @@ c21 CHAR(255), c22 CHAR(255), c23 CHAR(255), c24 CHAR(255),
c25 CHAR(255), c26 CHAR(255), c27 CHAR(255), c28 CHAR(255),
c29 CHAR(255), c30 CHAR(255), c31 CHAR(255), c32 CHAR(255)
) ENGINE = InnoDB;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
DROP TABLE IF EXISTS t1;
Warnings:
Note 1051 Unknown table 't1'
diff --git a/mysql-test/r/innodb_no_mrricp.result b/mysql-test/r/innodb_no_mrricp.result
index df0045ae6b1..674c47df171 100644
--- a/mysql-test/r/innodb_no_mrricp.result
+++ b/mysql-test/r/innodb_no_mrricp.result
@@ -3206,7 +3206,7 @@ c21 CHAR(255), c22 CHAR(255), c23 CHAR(255), c24 CHAR(255),
c25 CHAR(255), c26 CHAR(255), c27 CHAR(255), c28 CHAR(255),
c29 CHAR(255), c30 CHAR(255), c31 CHAR(255), c32 CHAR(255)
) ENGINE = InnoDB;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
DROP TABLE IF EXISTS t1;
Warnings:
Note 1051 Unknown table 't1'
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result
index d87aeefbc34..9d8e4229445 100644
--- a/mysql-test/r/openssl_1.result
+++ b/mysql-test/r/openssl_1.result
@@ -44,9 +44,9 @@ ERROR 42000: DELETE command denied to user 'ssl_user4'@'localhost' for table 't1
drop user ssl_user1@localhost, ssl_user2@localhost,
ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost;
drop table t1;
-mysqltest: Could not open connection 'default': 2026 SSL error: ASN: bad other signature confirmation
-mysqltest: Could not open connection 'default': 2026 SSL error: ASN: bad other signature confirmation
-mysqltest: Could not open connection 'default': 2026 SSL error: ASN: bad other signature confirmation
+mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx
+mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx
+mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx
SSL error: Unable to get private key from ''
mysqltest: Could not open connection 'default': 2026 SSL connection error
SSL error: Unable to get certificate from ''
diff --git a/mysql-test/r/subselect4.result b/mysql-test/r/subselect4.result
index a765ccd783d..2b173dbd208 100644
--- a/mysql-test/r/subselect4.result
+++ b/mysql-test/r/subselect4.result
@@ -1396,7 +1396,7 @@ ON SUBQUERY2_t3.f2)
GROUP BY t1.f4 ORDER BY t1.f1 LIMIT 10;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t2 system NULL NULL NULL NULL 1 Using temporary; Using filesort
-1 PRIMARY t1 index NULL f4 5 NULL 11 Using where
+1 PRIMARY t1 ALL NULL NULL NULL NULL 11 Using where
2 DEPENDENT SUBQUERY SUBQUERY2_t1 system NULL NULL NULL NULL 1
2 DEPENDENT SUBQUERY SUBQUERY2_t2 index NULL f4 5 NULL 11 Using index
2 DEPENDENT SUBQUERY SUBQUERY2_t3 ALL NULL NULL NULL NULL 11 Using where; Using join buffer (flat, BNL join)
View Lorry Controller Status