diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2018-02-23 03:04:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-24 00:50:58 +0100 |
| commit | d717fe76e10e582d98264afce56089741106814d (patch) | |
| tree | ff284ce16f4030d20e73f090f41bb72ca7afdb0a /storage | |
| parent | f3088112cbe928f0ad57bb56146bcf1e58c27108 (diff) | |
| download | mariadb-git-d717fe76e10e582d98264afce56089741106814d.tar.gz | |
Adjust test results to reflect the new system table
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/mysql-test/storage_engine/misc.rdiff | 17 | ||||
| -rw-r--r-- | storage/myisammrg/mysql-test/storage_engine/misc.rdiff | 17 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/storage_engine/misc.rdiff | 17 |
3 files changed, 39 insertions, 12 deletions
diff --git a/storage/myisam/mysql-test/storage_engine/misc.rdiff b/storage/myisam/mysql-test/storage_engine/misc.rdiff index 39d43d07be2..cdbad003217 100644 --- a/storage/myisam/mysql-test/storage_engine/misc.rdiff +++ b/storage/myisam/mysql-test/storage_engine/misc.rdiff @@ -1,16 +1,17 @@ ---- suite/storage_engine/misc.result 2013-11-08 21:49:40.000000000 +0400 -+++ suite/storage_engine/misc.reject 2013-11-08 21:51:58.000000000 +0400 -@@ -28,6 +28,9 @@ +--- suite/storage_engine/misc.result 2018-02-23 03:01:49.673249912 +0200 ++++ suite/storage_engine/misc.reject 2018-02-23 03:02:05.669249564 +0200 +@@ -28,6 +28,10 @@ SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_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' +Warnings: column_stats column_name NULL NULL column_stats db_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 prefix_arity NULL NULL index_stats table_name NULL NULL @@ -23,3 +24,11 @@ plugin name NULL NULL proc db 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 diff --git a/storage/myisammrg/mysql-test/storage_engine/misc.rdiff b/storage/myisammrg/mysql-test/storage_engine/misc.rdiff index 2430b055735..cdbad003217 100644 --- a/storage/myisammrg/mysql-test/storage_engine/misc.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/misc.rdiff @@ -1,16 +1,17 @@ ---- suite/storage_engine/misc.result 2013-11-08 21:49:40.000000000 +0400 -+++ suite/storage_engine/misc.reject 2013-11-08 21:58:42.000000000 +0400 -@@ -28,6 +28,9 @@ +--- suite/storage_engine/misc.result 2018-02-23 03:01:49.673249912 +0200 ++++ suite/storage_engine/misc.reject 2018-02-23 03:02:05.669249564 +0200 +@@ -28,6 +28,10 @@ SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_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' +Warnings: column_stats column_name NULL NULL column_stats db_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 prefix_arity NULL NULL index_stats table_name NULL NULL @@ -23,3 +24,11 @@ plugin name NULL NULL proc db 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 diff --git a/storage/rocksdb/mysql-test/storage_engine/misc.rdiff b/storage/rocksdb/mysql-test/storage_engine/misc.rdiff index 694f3f54815..cdbad003217 100644 --- a/storage/rocksdb/mysql-test/storage_engine/misc.rdiff +++ b/storage/rocksdb/mysql-test/storage_engine/misc.rdiff @@ -1,16 +1,17 @@ ---- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/misc.result 2017-06-22 00:33:46.419995639 +0300 -+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/misc.reject 2017-06-22 02:34:23.647950149 +0300 -@@ -28,6 +28,9 @@ +--- suite/storage_engine/misc.result 2018-02-23 03:01:49.673249912 +0200 ++++ suite/storage_engine/misc.reject 2018-02-23 03:02:05.669249564 +0200 +@@ -28,6 +28,10 @@ SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_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' +Warnings: column_stats column_name NULL NULL column_stats db_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 prefix_arity NULL NULL index_stats table_name NULL NULL @@ -23,3 +24,11 @@ plugin name NULL NULL proc db 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 |