~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to mysql-test/r/mysqlshow.result

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
2 rows in set.
76
76
 
77
77
DROP TABLE t1, t2;
78
 
Database: information_schema
79
 
+---------------------------------------+
80
 
|                Tables                 |
81
 
+---------------------------------------+
82
 
| CHARACTER_SETS                        |
83
 
| COLLATIONS                            |
84
 
| COLLATION_CHARACTER_SET_APPLICABILITY |
85
 
| COLUMNS                               |
86
 
| COLUMN_PRIVILEGES                     |
87
 
| ENGINES                               |
88
 
| EVENTS                                |
89
 
| FILES                                 |
90
 
| GLOBAL_STATUS                         |
91
 
| GLOBAL_VARIABLES                      |
92
 
| KEY_COLUMN_USAGE                      |
93
 
| PARAMETERS                            |
94
 
| PARTITIONS                            |
95
 
| PLUGINS                               |
96
 
| PROCESSLIST                           |
97
 
| PROFILING                             |
98
 
| REFERENTIAL_CONSTRAINTS               |
99
 
| ROUTINES                              |
100
 
| SCHEMATA                              |
101
 
| SCHEMA_PRIVILEGES                     |
102
 
| SESSION_STATUS                        |
103
 
| SESSION_VARIABLES                     |
104
 
| STATISTICS                            |
105
 
| TABLES                                |
106
 
| TABLE_CONSTRAINTS                     |
107
 
| TABLE_PRIVILEGES                      |
108
 
| TRIGGERS                              |
109
 
| USER_PRIVILEGES                       |
110
 
| VIEWS                                 |
111
 
+---------------------------------------+
112
 
Database: INFORMATION_SCHEMA
113
 
+---------------------------------------+
114
 
|                Tables                 |
115
 
+---------------------------------------+
116
 
| CHARACTER_SETS                        |
117
 
| COLLATIONS                            |
118
 
| COLLATION_CHARACTER_SET_APPLICABILITY |
119
 
| COLUMNS                               |
120
 
| COLUMN_PRIVILEGES                     |
121
 
| ENGINES                               |
122
 
| EVENTS                                |
123
 
| FILES                                 |
124
 
| GLOBAL_STATUS                         |
125
 
| GLOBAL_VARIABLES                      |
126
 
| KEY_COLUMN_USAGE                      |
127
 
| PARAMETERS                            |
128
 
| PARTITIONS                            |
129
 
| PLUGINS                               |
130
 
| PROCESSLIST                           |
131
 
| PROFILING                             |
132
 
| REFERENTIAL_CONSTRAINTS               |
133
 
| ROUTINES                              |
134
 
| SCHEMATA                              |
135
 
| SCHEMA_PRIVILEGES                     |
136
 
| SESSION_STATUS                        |
137
 
| SESSION_VARIABLES                     |
138
 
| STATISTICS                            |
139
 
| TABLES                                |
140
 
| TABLE_CONSTRAINTS                     |
141
 
| TABLE_PRIVILEGES                      |
142
 
| TRIGGERS                              |
143
 
| USER_PRIVILEGES                       |
144
 
| VIEWS                                 |
145
 
+---------------------------------------+
 
78
Database: information_schema  Wildcard: TABLE%
 
79
+-------------------+
 
80
|      Tables       |
 
81
+-------------------+
 
82
| TABLES            |
 
83
| TABLE_CONSTRAINTS |
 
84
| TABLE_PRIVILEGES  |
 
85
+-------------------+
 
86
Database: INFORMATION_SCHEMA  Wildcard: TABLE%
 
87
+-------------------+
 
88
|      Tables       |
 
89
+-------------------+
 
90
| TABLES            |
 
91
| TABLE_CONSTRAINTS |
 
92
| TABLE_PRIVILEGES  |
 
93
+-------------------+
146
94
Wildcard: inf_rmation_schema
147
95
+--------------------+
148
96
|     Databases      |