Skip to content

M
MariaDB
Commit cd08de06 authored by guilhem@gbichot3.local's avatar guilhem@gbichot3.local
Browse files
Options

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 

into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-clean
parents 7e95cda2 9474d3fe
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
mysql-test/r/mysqlshow.result
View file @ cd08de06
...@@ -87,6 +87,8 @@ Database: information_schema ...@@ -87,6 +87,8 @@ Database: information_schema
| ENGINES | | ENGINES |
| EVENTS | | EVENTS |
| FILES | | FILES |
| GLOBAL_STATUS |
| GLOBAL_VARIABLES |
| KEY_COLUMN_USAGE | | KEY_COLUMN_USAGE |
| PARTITIONS | | PARTITIONS |
| PLUGINS | | PLUGINS |
...@@ -95,6 +97,8 @@ Database: information_schema ...@@ -95,6 +97,8 @@ Database: information_schema
| ROUTINES | | ROUTINES |
| SCHEMATA | | SCHEMATA |
| SCHEMA_PRIVILEGES | | SCHEMA_PRIVILEGES |
| SESSION_STATUS |
| SESSION_VARIABLES |
| STATISTICS | | STATISTICS |
| TABLES | | TABLES |
| TABLE_CONSTRAINTS | | TABLE_CONSTRAINTS |
...@@ -115,6 +119,8 @@ Database: INFORMATION_SCHEMA ...@@ -115,6 +119,8 @@ Database: INFORMATION_SCHEMA
| ENGINES | | ENGINES |
| EVENTS | | EVENTS |
| FILES | | FILES |
| GLOBAL_STATUS |
| GLOBAL_VARIABLES |
| KEY_COLUMN_USAGE | | KEY_COLUMN_USAGE |
| PARTITIONS | | PARTITIONS |
| PLUGINS | | PLUGINS |
...@@ -123,6 +129,8 @@ Database: INFORMATION_SCHEMA ...@@ -123,6 +129,8 @@ Database: INFORMATION_SCHEMA
| ROUTINES | | ROUTINES |
| SCHEMATA | | SCHEMATA |
| SCHEMA_PRIVILEGES | | SCHEMA_PRIVILEGES |
| SESSION_STATUS |
| SESSION_VARIABLES |
| STATISTICS | | STATISTICS |
| TABLES | | TABLES |
| TABLE_CONSTRAINTS | | TABLE_CONSTRAINTS |
......
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