Skip to content

M
MariaDB
Commit d717fe76 authored by Elena Stepanova's avatar Elena Stepanova Committed by Sergei Golubchik
Browse files
Options

Adjust test results to reflect the new system table

parent f3088112
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 12 deletions
mysql-test/suite/storage_engine/misc.result
View file @ d717fe76
...@@ -94,5 +94,7 @@ time_zone_transition Time_zone_id NULL NULL ...@@ -94,5 +94,7 @@ time_zone_transition Time_zone_id NULL NULL
time_zone_transition Transition_time NULL NULL time_zone_transition Transition_time NULL NULL
time_zone_transition_type Time_zone_id NULL NULL time_zone_transition_type Time_zone_id NULL NULL
time_zone_transition_type Transition_type_id NULL NULL time_zone_transition_type Transition_type_id NULL NULL
transaction_registry commit_id NULL NULL
transaction_registry transaction_id NULL NULL
user Host NULL NULL user Host NULL NULL
user User NULL NULL user User NULL NULL
storage/myisam/mysql-test/storage_engine/misc.rdiff
View file @ d717fe76
--- suite/storage_engine/misc.result 2013-11-08 21:49:40.000000000 +0400 --- suite/storage_engine/misc.result 2018-02-23 03:01:49.673249912 +0200
+++ suite/storage_engine/misc.reject 2013-11-08 21:51:58.000000000 +0400 +++ suite/storage_engine/misc.reject 2018-02-23 03:02:05.669249564 +0200
@@ -28,6 +28,9 @@ @@ -28,6 +28,10 @@
SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME; FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME;
TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME
+Warning 1286 Unknown storage engine 'InnoDB' +Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB' +Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB'
+Warnings: +Warnings:
column_stats column_name NULL NULL column_stats column_name NULL NULL
column_stats db_name NULL NULL column_stats db_name NULL NULL
column_stats table_name NULL NULL column_stats table_name NULL NULL
@@ -58,12 +61,6 @@ @@ -58,12 +62,6 @@
index_stats index_name NULL NULL index_stats index_name NULL NULL
index_stats prefix_arity NULL NULL index_stats prefix_arity NULL NULL
index_stats table_name NULL NULL index_stats table_name NULL NULL
...@@ -23,3 +24,11 @@ ...@@ -23,3 +24,11 @@
plugin name NULL NULL plugin name NULL NULL
proc db NULL NULL proc db NULL NULL
proc name NULL NULL proc name NULL NULL
@@ -94,7 +92,5 @@
time_zone_transition Transition_time NULL NULL
time_zone_transition_type Time_zone_id NULL NULL
time_zone_transition_type Transition_type_id NULL NULL
-transaction_registry commit_id NULL NULL
-transaction_registry transaction_id NULL NULL
user Host NULL NULL
user User NULL NULL
storage/myisammrg/mysql-test/storage_engine/misc.rdiff
View file @ d717fe76
--- suite/storage_engine/misc.result 2013-11-08 21:49:40.000000000 +0400 --- suite/storage_engine/misc.result 2018-02-23 03:01:49.673249912 +0200
+++ suite/storage_engine/misc.reject 2013-11-08 21:58:42.000000000 +0400 +++ suite/storage_engine/misc.reject 2018-02-23 03:02:05.669249564 +0200
@@ -28,6 +28,9 @@ @@ -28,6 +28,10 @@
SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME; FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME;
TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME
+Warning 1286 Unknown storage engine 'InnoDB' +Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB' +Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB'
+Warnings: +Warnings:
column_stats column_name NULL NULL column_stats column_name NULL NULL
column_stats db_name NULL NULL column_stats db_name NULL NULL
column_stats table_name NULL NULL column_stats table_name NULL NULL
@@ -58,12 +61,6 @@ @@ -58,12 +62,6 @@
index_stats index_name NULL NULL index_stats index_name NULL NULL
index_stats prefix_arity NULL NULL index_stats prefix_arity NULL NULL
index_stats table_name NULL NULL index_stats table_name NULL NULL
...@@ -23,3 +24,11 @@ ...@@ -23,3 +24,11 @@
plugin name NULL NULL plugin name NULL NULL
proc db NULL NULL proc db NULL NULL
proc name NULL NULL proc name NULL NULL
@@ -94,7 +92,5 @@
time_zone_transition Transition_time NULL NULL
time_zone_transition_type Time_zone_id NULL NULL
time_zone_transition_type Transition_type_id NULL NULL
-transaction_registry commit_id NULL NULL
-transaction_registry transaction_id NULL NULL
user Host NULL NULL
user User NULL NULL
storage/rocksdb/mysql-test/storage_engine/misc.rdiff
View file @ d717fe76
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/misc.result 2017-06-22 00:33:46.419995639 +0300 --- suite/storage_engine/misc.result 2018-02-23 03:01:49.673249912 +0200
+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/misc.reject 2017-06-22 02:34:23.647950149 +0300 +++ suite/storage_engine/misc.reject 2018-02-23 03:02:05.669249564 +0200
@@ -28,6 +28,9 @@ @@ -28,6 +28,10 @@
SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME; FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME;
TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME
+Warning 1286 Unknown storage engine 'InnoDB' +Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB' +Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB'
+Warnings: +Warnings:
column_stats column_name NULL NULL column_stats column_name NULL NULL
column_stats db_name NULL NULL column_stats db_name NULL NULL
column_stats table_name NULL NULL column_stats table_name NULL NULL
@@ -58,12 +61,6 @@ @@ -58,12 +62,6 @@
index_stats index_name NULL NULL index_stats index_name NULL NULL
index_stats prefix_arity NULL NULL index_stats prefix_arity NULL NULL
index_stats table_name NULL NULL index_stats table_name NULL NULL
...@@ -23,3 +24,11 @@ ...@@ -23,3 +24,11 @@
plugin name NULL NULL plugin name NULL NULL
proc db NULL NULL proc db NULL NULL
proc name NULL NULL proc name NULL NULL
@@ -94,7 +92,5 @@
time_zone_transition Transition_time NULL NULL
time_zone_transition_type Time_zone_id NULL NULL
time_zone_transition_type Transition_type_id NULL NULL
-transaction_registry commit_id NULL NULL
-transaction_registry transaction_id NULL NULL
user Host NULL NULL
user User NULL NULL
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7