1
=== modified file 'drizzled/table_share.cc'
2
--- drizzled/table_share.cc	2010-08-02 01:14:04 +0000
3
+++ drizzled/table_share.cc	2010-08-03 22:26:42 +0000
4
@@ -1317,7 +1317,7 @@
5
1317
    Item *default_value= NULL;
1317
    Item *default_value= NULL;
6
1318
1318
7
1319
    if (pfield.options().has_default_value() ||
1319
    if (pfield.options().has_default_value() ||
9
1320
        pfield.options().has_default_null()  ||
1320
        pfield.options().default_null()  ||
10
1321
        pfield.options().has_default_bin_value())
1321
        pfield.options().has_default_bin_value())
11
1322
    {
1322
    {
12
1323
      default_value= default_value_item(field_type,
1323
      default_value= default_value_item(field_type,
13
1324
1324
14
=== modified file 'plugin/collation_dictionary/tests/r/data_dictionary.result'
15
--- plugin/collation_dictionary/tests/r/data_dictionary.result	2010-07-12 06:26:42 +0000
16
+++ plugin/collation_dictionary/tests/r/data_dictionary.result	2010-08-03 22:26:42 +0000
17
@@ -2,21 +2,21 @@
18
2
show create table CHARACTER_SETS ;
2
show create table CHARACTER_SETS ;
19
3
Table	Create Table
3
Table	Create Table
20
4
CHARACTER_SETS	CREATE TABLE `character_sets` (
4
CHARACTER_SETS	CREATE TABLE `character_sets` (
25
5
  `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
5
  `CHARACTER_SET_NAME` varchar(256) NOT NULL,
26
6
  `DEFAULT_COLLATE_NAME` varchar(256) NOT NULL DEFAULT '',
6
  `DEFAULT_COLLATE_NAME` varchar(256) NOT NULL,
27
7
  `DESCRIPTION` varchar(256) NOT NULL DEFAULT '',
7
  `DESCRIPTION` varchar(256) NOT NULL,
28
8
  `MAXLEN` bigint NOT NULL DEFAULT '0'
8
  `MAXLEN` bigint NOT NULL
29
9
) ENGINE=FunctionEngine
9
) ENGINE=FunctionEngine
30
10
show create table COLLATIONS ;
10
show create table COLLATIONS ;
31
11
Table	Create Table
11
Table	Create Table
32
12
COLLATIONS	CREATE TABLE `collations` (
12
COLLATIONS	CREATE TABLE `collations` (
40
13
  `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
13
  `CHARACTER_SET_NAME` varchar(256) NOT NULL,
41
14
  `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
14
  `COLLATION_NAME` varchar(256) NOT NULL,
42
15
  `DESCRIPTION` varchar(256) NOT NULL DEFAULT '',
15
  `DESCRIPTION` varchar(256) NOT NULL,
43
16
  `ID` bigint NOT NULL DEFAULT '0',
16
  `ID` bigint NOT NULL,
44
17
  `IS_DEFAULT` varchar(5) NOT NULL DEFAULT '',
17
  `IS_DEFAULT` varchar(5) NOT NULL,
45
18
  `IS_COMPILED` varchar(5) NOT NULL DEFAULT '',
18
  `IS_COMPILED` varchar(5) NOT NULL,
46
19
  `SORTLEN` bigint NOT NULL DEFAULT '0'
19
  `SORTLEN` bigint NOT NULL
47
20
) ENGINE=FunctionEngine
20
) ENGINE=FunctionEngine
48
21
SELECT * FROM character_sets ORDER BY CHARACTER_SET_NAME;
21
SELECT * FROM character_sets ORDER BY CHARACTER_SET_NAME;
49
22
CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
22
CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
50
23
23
51
=== modified file 'plugin/information_schema_dictionary/tests/r/show_create_table.result'
52
--- plugin/information_schema_dictionary/tests/r/show_create_table.result	2010-07-10 20:25:16 +0000
53
+++ plugin/information_schema_dictionary/tests/r/show_create_table.result	2010-08-03 22:26:42 +0000
54
@@ -2,22 +2,22 @@
55
2
SHOW CREATE TABLE `CHECK_CONSTRAINTS`;
2
SHOW CREATE TABLE `CHECK_CONSTRAINTS`;
56
3
Table	Create Table
3
Table	Create Table
57
4
CHECK_CONSTRAINTS	CREATE TABLE `check_constraints` (
4
CHECK_CONSTRAINTS	CREATE TABLE `check_constraints` (
62
5
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
5
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
63
6
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
6
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
64
7
  `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
7
  `CONSTRAINT_NAME` varchar(256) NOT NULL,
65
8
  `CHECK_CLAUSE` varchar(256) NOT NULL DEFAULT ''
8
  `CHECK_CLAUSE` varchar(256) NOT NULL
66
9
) ENGINE=FunctionEngine
9
) ENGINE=FunctionEngine
67
10
SHOW CREATE TABLE `COLUMNS`;
10
SHOW CREATE TABLE `COLUMNS`;
68
11
Table	Create Table
11
Table	Create Table
69
12
COLUMNS	CREATE TABLE `columns` (
12
COLUMNS	CREATE TABLE `columns` (
75
13
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
13
  `TABLE_CATALOG` varchar(256) NOT NULL,
76
14
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
14
  `TABLE_SCHEMA` varchar(256) NOT NULL,
77
15
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
15
  `TABLE_NAME` varchar(256) NOT NULL,
78
16
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
16
  `COLUMN_NAME` varchar(256) NOT NULL,
79
17
  `ORDINAL_POSITION` bigint NOT NULL DEFAULT '0',
17
  `ORDINAL_POSITION` bigint NOT NULL,
80
18
  `COLUMN_DEFAULT` varchar(256) DEFAULT NULL,
18
  `COLUMN_DEFAULT` varchar(256) DEFAULT NULL,
83
19
  `IS_NULLABLE` varchar(5) NOT NULL DEFAULT '',
19
  `IS_NULLABLE` varchar(5) NOT NULL,
84
20
  `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
20
  `DATA_TYPE` varchar(256) NOT NULL,
85
21
  `CHARACTER_MAXIMUM_LENGTH` bigint DEFAULT NULL,
21
  `CHARACTER_MAXIMUM_LENGTH` bigint DEFAULT NULL,
86
22
  `CHARACTER_OCTET_LENGTH` bigint DEFAULT NULL,
22
  `CHARACTER_OCTET_LENGTH` bigint DEFAULT NULL,
87
23
  `NUMERIC_PRECISION` bigint DEFAULT NULL,
23
  `NUMERIC_PRECISION` bigint DEFAULT NULL,
88
@@ -37,294 +37,294 @@
89
37
SHOW CREATE TABLE `COLUMN_DOMAIN_USAGE`;
37
SHOW CREATE TABLE `COLUMN_DOMAIN_USAGE`;
90
38
Table	Create Table
38
Table	Create Table
91
39
COLUMN_DOMAIN_USAGE	CREATE TABLE `column_domain_usage` (
39
COLUMN_DOMAIN_USAGE	CREATE TABLE `column_domain_usage` (
99
40
  `DOMAIN_CATALOG` varchar(256) NOT NULL DEFAULT '',
40
  `DOMAIN_CATALOG` varchar(256) NOT NULL,
100
41
  `DOMAIN_SCHEMA` varchar(256) NOT NULL DEFAULT '',
41
  `DOMAIN_SCHEMA` varchar(256) NOT NULL,
101
42
  `DOMAIN_NAME` varchar(256) NOT NULL DEFAULT '',
42
  `DOMAIN_NAME` varchar(256) NOT NULL,
102
43
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
43
  `TABLE_CATALOG` varchar(256) NOT NULL,
103
44
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
44
  `TABLE_SCHEMA` varchar(256) NOT NULL,
104
45
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
45
  `TABLE_NAME` varchar(256) NOT NULL,
105
46
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT ''
46
  `COLUMN_NAME` varchar(256) NOT NULL
106
47
) ENGINE=FunctionEngine
47
) ENGINE=FunctionEngine
107
48
SHOW CREATE TABLE `COLUMN_PRIVILEGES`;
48
SHOW CREATE TABLE `COLUMN_PRIVILEGES`;
108
49
Table	Create Table
49
Table	Create Table
109
50
COLUMN_PRIVILEGES	CREATE TABLE `column_privileges` (
50
COLUMN_PRIVILEGES	CREATE TABLE `column_privileges` (
118
51
  `GRANTOR` varchar(256) NOT NULL DEFAULT '',
51
  `GRANTOR` varchar(256) NOT NULL,
119
52
  `GRANTEE` varchar(256) NOT NULL DEFAULT '',
52
  `GRANTEE` varchar(256) NOT NULL,
120
53
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
53
  `TABLE_CATALOG` varchar(256) NOT NULL,
121
54
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
54
  `TABLE_SCHEMA` varchar(256) NOT NULL,
122
55
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
55
  `TABLE_NAME` varchar(256) NOT NULL,
123
56
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
56
  `COLUMN_NAME` varchar(256) NOT NULL,
124
57
  `PRIVILEGE_TYPE` varchar(256) NOT NULL DEFAULT '',
57
  `PRIVILEGE_TYPE` varchar(256) NOT NULL,
125
58
  `IS_GRANTABLE` varchar(256) NOT NULL DEFAULT ''
58
  `IS_GRANTABLE` varchar(256) NOT NULL
126
59
) ENGINE=FunctionEngine
59
) ENGINE=FunctionEngine
127
60
SHOW CREATE TABLE `CONSTRAINT_COLUMN_USAGE`;
60
SHOW CREATE TABLE `CONSTRAINT_COLUMN_USAGE`;
128
61
Table	Create Table
61
Table	Create Table
129
62
CONSTRAINT_COLUMN_USAGE	CREATE TABLE `constraint_column_usage` (
62
CONSTRAINT_COLUMN_USAGE	CREATE TABLE `constraint_column_usage` (
137
63
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
63
  `TABLE_CATALOG` varchar(256) NOT NULL,
138
64
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
64
  `TABLE_SCHEMA` varchar(256) NOT NULL,
139
65
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
65
  `TABLE_NAME` varchar(256) NOT NULL,
140
66
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
66
  `COLUMN_NAME` varchar(256) NOT NULL,
141
67
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
67
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
142
68
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
68
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
143
69
  `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT ''
69
  `CONSTRAINT_NAME` varchar(256) NOT NULL
144
70
) ENGINE=FunctionEngine
70
) ENGINE=FunctionEngine
145
71
SHOW CREATE TABLE `CONSTRAINT_TABLE_USAGE`;
71
SHOW CREATE TABLE `CONSTRAINT_TABLE_USAGE`;
146
72
Table	Create Table
72
Table	Create Table
147
73
CONSTRAINT_TABLE_USAGE	CREATE TABLE `constraint_table_usage` (
73
CONSTRAINT_TABLE_USAGE	CREATE TABLE `constraint_table_usage` (
154
74
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
74
  `TABLE_CATALOG` varchar(256) NOT NULL,
155
75
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
75
  `TABLE_SCHEMA` varchar(256) NOT NULL,
156
76
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
76
  `TABLE_NAME` varchar(256) NOT NULL,
157
77
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
77
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
158
78
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
78
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
159
79
  `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT ''
79
  `CONSTRAINT_NAME` varchar(256) NOT NULL
160
80
) ENGINE=FunctionEngine
80
) ENGINE=FunctionEngine
161
81
SHOW CREATE TABLE `DOMAINS`;
81
SHOW CREATE TABLE `DOMAINS`;
162
82
Table	Create Table
82
Table	Create Table
163
83
DOMAINS	CREATE TABLE `domains` (
83
DOMAINS	CREATE TABLE `domains` (
181
84
  `DOMAIN_CATALOG` varchar(256) NOT NULL DEFAULT '',
84
  `DOMAIN_CATALOG` varchar(256) NOT NULL,
182
85
  `DOMAIN_SCHEMA` varchar(256) NOT NULL DEFAULT '',
85
  `DOMAIN_SCHEMA` varchar(256) NOT NULL,
183
86
  `DOMAIN_NAME` varchar(256) NOT NULL DEFAULT '',
86
  `DOMAIN_NAME` varchar(256) NOT NULL,
184
87
  `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
87
  `DATA_TYPE` varchar(256) NOT NULL,
185
88
  `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL DEFAULT '',
88
  `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL,
186
89
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
89
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
187
90
  `COLLATION_CATALOG` varchar(256) NOT NULL DEFAULT '',
90
  `COLLATION_CATALOG` varchar(256) NOT NULL,
188
91
  `COLLATION_SCHEMA` varchar(256) NOT NULL DEFAULT '',
91
  `COLLATION_SCHEMA` varchar(256) NOT NULL,
189
92
  `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
92
  `COLLATION_NAME` varchar(256) NOT NULL,
190
93
  `CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
93
  `CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
191
94
  `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
94
  `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
192
95
  `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
95
  `CHARACTER_SET_NAME` varchar(256) NOT NULL,
193
96
  `NUMERIC_PRECISION` varchar(256) NOT NULL DEFAULT '',
96
  `NUMERIC_PRECISION` varchar(256) NOT NULL,
194
97
  `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL DEFAULT '',
97
  `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL,
195
98
  `NUMERIC_SCALE` varchar(256) NOT NULL DEFAULT '',
98
  `NUMERIC_SCALE` varchar(256) NOT NULL,
196
99
  `DATETIME_PRECISION` varchar(256) NOT NULL DEFAULT '',
99
  `DATETIME_PRECISION` varchar(256) NOT NULL,
197
100
  `DOMAIN_DEFAULT` varchar(256) NOT NULL DEFAULT ''
100
  `DOMAIN_DEFAULT` varchar(256) NOT NULL
198
101
) ENGINE=FunctionEngine
101
) ENGINE=FunctionEngine
199
102
SHOW CREATE TABLE `DOMAIN_CONSTRAINTS`;
102
SHOW CREATE TABLE `DOMAIN_CONSTRAINTS`;
200
103
Table	Create Table
103
Table	Create Table
201
104
DOMAIN_CONSTRAINTS	CREATE TABLE `domain_constraints` (
104
DOMAIN_CONSTRAINTS	CREATE TABLE `domain_constraints` (
210
105
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
105
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
211
106
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
106
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
212
107
  `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
107
  `CONSTRAINT_NAME` varchar(256) NOT NULL,
213
108
  `DOMAIN_CATALOG` varchar(256) NOT NULL DEFAULT '',
108
  `DOMAIN_CATALOG` varchar(256) NOT NULL,
214
109
  `DOMAIN_SCHEMA` varchar(256) NOT NULL DEFAULT '',
109
  `DOMAIN_SCHEMA` varchar(256) NOT NULL,
215
110
  `DOMAIN_NAME` varchar(256) NOT NULL DEFAULT '',
110
  `DOMAIN_NAME` varchar(256) NOT NULL,
216
111
  `IS_DEFERRABLE` varchar(256) NOT NULL DEFAULT '',
111
  `IS_DEFERRABLE` varchar(256) NOT NULL,
217
112
  `INITIALLY_DEFERRED` varchar(256) NOT NULL DEFAULT ''
112
  `INITIALLY_DEFERRED` varchar(256) NOT NULL
218
113
) ENGINE=FunctionEngine
113
) ENGINE=FunctionEngine
219
114
SHOW CREATE TABLE `KEY_COLUMN_USAGE`;
114
SHOW CREATE TABLE `KEY_COLUMN_USAGE`;
220
115
Table	Create Table
115
Table	Create Table
221
116
KEY_COLUMN_USAGE	CREATE TABLE `key_column_usage` (
116
KEY_COLUMN_USAGE	CREATE TABLE `key_column_usage` (
230
117
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
117
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
231
118
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
118
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
232
119
  `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
119
  `CONSTRAINT_NAME` varchar(256) NOT NULL,
233
120
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
120
  `TABLE_CATALOG` varchar(256) NOT NULL,
234
121
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
121
  `TABLE_SCHEMA` varchar(256) NOT NULL,
235
122
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
122
  `TABLE_NAME` varchar(256) NOT NULL,
236
123
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
123
  `COLUMN_NAME` varchar(256) NOT NULL,
237
124
  `ORDINAL_POSITION` bigint NOT NULL DEFAULT '0'
124
  `ORDINAL_POSITION` bigint NOT NULL
238
125
) ENGINE=FunctionEngine
125
) ENGINE=FunctionEngine
239
126
SHOW CREATE TABLE `PARAMETERS`;
126
SHOW CREATE TABLE `PARAMETERS`;
240
127
Table	Create Table
127
Table	Create Table
241
128
PARAMETERS	CREATE TABLE `parameters` (
128
PARAMETERS	CREATE TABLE `parameters` (
272
129
  `SPECIFIC_CATALOG` varchar(256) NOT NULL DEFAULT '',
129
  `SPECIFIC_CATALOG` varchar(256) NOT NULL,
273
130
  `SPECIFIC_SCHEMA` varchar(256) NOT NULL DEFAULT '',
130
  `SPECIFIC_SCHEMA` varchar(256) NOT NULL,
274
131
  `SPECIFIC_NAME` varchar(256) NOT NULL DEFAULT '',
131
  `SPECIFIC_NAME` varchar(256) NOT NULL,
275
132
  `ORDINAL_POSITION` varchar(256) NOT NULL DEFAULT '',
132
  `ORDINAL_POSITION` varchar(256) NOT NULL,
276
133
  `PARAMETER_MODE` varchar(256) NOT NULL DEFAULT '',
133
  `PARAMETER_MODE` varchar(256) NOT NULL,
277
134
  `IS_RESULT` varchar(256) NOT NULL DEFAULT '',
134
  `IS_RESULT` varchar(256) NOT NULL,
278
135
  `AS_LOCATOR` varchar(256) NOT NULL DEFAULT '',
135
  `AS_LOCATOR` varchar(256) NOT NULL,
279
136
  `PARAMETER_NAME` varchar(256) NOT NULL DEFAULT '',
136
  `PARAMETER_NAME` varchar(256) NOT NULL,
280
137
  `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
137
  `DATA_TYPE` varchar(256) NOT NULL,
281
138
  `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL DEFAULT '',
138
  `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL,
282
139
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
139
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
283
140
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
140
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
284
141
  `COLLATION_CATALOG` varchar(256) NOT NULL DEFAULT '',
141
  `COLLATION_CATALOG` varchar(256) NOT NULL,
285
142
  `COLLATION_SCHEMA` varchar(256) NOT NULL DEFAULT '',
142
  `COLLATION_SCHEMA` varchar(256) NOT NULL,
286
143
  `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
143
  `COLLATION_NAME` varchar(256) NOT NULL,
287
144
  `CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
144
  `CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
288
145
  `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
145
  `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
289
146
  `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
146
  `CHARACTER_SET_NAME` varchar(256) NOT NULL,
290
147
  `NUMERIC_PRECISION` varchar(256) NOT NULL DEFAULT '',
147
  `NUMERIC_PRECISION` varchar(256) NOT NULL,
291
148
  `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL DEFAULT '',
148
  `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL,
292
149
  `NUMERIC_SCALE` varchar(256) NOT NULL DEFAULT '',
149
  `NUMERIC_SCALE` varchar(256) NOT NULL,
293
150
  `DATETIME_PRECISION` varchar(256) NOT NULL DEFAULT '',
150
  `DATETIME_PRECISION` varchar(256) NOT NULL,
294
151
  `INTERVAL_TYPE` varchar(256) NOT NULL DEFAULT '',
151
  `INTERVAL_TYPE` varchar(256) NOT NULL,
295
152
  `INTERVAL_PRECISION` varchar(256) NOT NULL DEFAULT '',
152
  `INTERVAL_PRECISION` varchar(256) NOT NULL,
296
153
  `USER_DEFINED_TYPE_CATALOG` varchar(256) NOT NULL DEFAULT '',
153
  `USER_DEFINED_TYPE_CATALOG` varchar(256) NOT NULL,
297
154
  `USER_DEFINED_TYPE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
154
  `USER_DEFINED_TYPE_SCHEMA` varchar(256) NOT NULL,
298
155
  `USER_DEFINED_TYPE_NAME` varchar(256) NOT NULL DEFAULT '',
155
  `USER_DEFINED_TYPE_NAME` varchar(256) NOT NULL,
299
156
  `SCOPE_CATALOG` varchar(256) NOT NULL DEFAULT '',
156
  `SCOPE_CATALOG` varchar(256) NOT NULL,
300
157
  `SCOPE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
157
  `SCOPE_SCHEMA` varchar(256) NOT NULL,
301
158
  `SCOPE_NAME` varchar(256) NOT NULL DEFAULT ''
158
  `SCOPE_NAME` varchar(256) NOT NULL
302
159
) ENGINE=FunctionEngine
159
) ENGINE=FunctionEngine
303
160
SHOW CREATE TABLE `REFERENTIAL_CONSTRAINTS`;
160
SHOW CREATE TABLE `REFERENTIAL_CONSTRAINTS`;
304
161
Table	Create Table
161
Table	Create Table
305
162
REFERENTIAL_CONSTRAINTS	CREATE TABLE `referential_constraints` (
162
REFERENTIAL_CONSTRAINTS	CREATE TABLE `referential_constraints` (
315
163
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
163
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
316
164
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
164
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
317
165
  `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
165
  `CONSTRAINT_NAME` varchar(256) NOT NULL,
318
166
  `UNIQUE_CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
166
  `UNIQUE_CONSTRAINT_CATALOG` varchar(256) NOT NULL,
319
167
  `UNIQUE_CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
167
  `UNIQUE_CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
320
168
  `UNIQUE_CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
168
  `UNIQUE_CONSTRAINT_NAME` varchar(256) NOT NULL,
321
169
  `MATCH_OPTION` varchar(256) NOT NULL DEFAULT '',
169
  `MATCH_OPTION` varchar(256) NOT NULL,
322
170
  `UPDATE_RULE` varchar(256) NOT NULL DEFAULT '',
170
  `UPDATE_RULE` varchar(256) NOT NULL,
323
171
  `DELETE_RULE` varchar(256) NOT NULL DEFAULT ''
171
  `DELETE_RULE` varchar(256) NOT NULL
324
172
) ENGINE=FunctionEngine
172
) ENGINE=FunctionEngine
325
173
SHOW CREATE TABLE `ROUTINES`;
173
SHOW CREATE TABLE `ROUTINES`;
326
174
Table	Create Table
174
Table	Create Table
327
175
ROUTINES	CREATE TABLE `routines` (
175
ROUTINES	CREATE TABLE `routines` (
381
176
  `SPECIFIC_CATALOG` varchar(256) NOT NULL DEFAULT '',
176
  `SPECIFIC_CATALOG` varchar(256) NOT NULL,
382
177
  `SPECIFIC_SCHEMA` varchar(256) NOT NULL DEFAULT '',
177
  `SPECIFIC_SCHEMA` varchar(256) NOT NULL,
383
178
  `SPECIFIC_NAME` varchar(256) NOT NULL DEFAULT '',
178
  `SPECIFIC_NAME` varchar(256) NOT NULL,
384
179
  `ROUTINE_CATALOG` varchar(256) NOT NULL DEFAULT '',
179
  `ROUTINE_CATALOG` varchar(256) NOT NULL,
385
180
  `ROUTINE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
180
  `ROUTINE_SCHEMA` varchar(256) NOT NULL,
386
181
  `ROUTINE_NAME` varchar(256) NOT NULL DEFAULT '',
181
  `ROUTINE_NAME` varchar(256) NOT NULL,
387
182
  `MODULE_CATALOG` varchar(256) NOT NULL DEFAULT '',
182
  `MODULE_CATALOG` varchar(256) NOT NULL,
388
183
  `MODULE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
183
  `MODULE_SCHEMA` varchar(256) NOT NULL,
389
184
  `MODULE_NAME` varchar(256) NOT NULL DEFAULT '',
184
  `MODULE_NAME` varchar(256) NOT NULL,
390
185
  `UDT_CATALOG` varchar(256) NOT NULL DEFAULT '',
185
  `UDT_CATALOG` varchar(256) NOT NULL,
391
186
  `UDT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
186
  `UDT_SCHEMA` varchar(256) NOT NULL,
392
187
  `UDT_NAME` varchar(256) NOT NULL DEFAULT '',
187
  `UDT_NAME` varchar(256) NOT NULL,
393
188
  `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
188
  `DATA_TYPE` varchar(256) NOT NULL,
394
189
  `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL DEFAULT '',
189
  `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL,
395
190
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
190
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
396
191
  `COLLATION_CATALOG` varchar(256) NOT NULL DEFAULT '',
191
  `COLLATION_CATALOG` varchar(256) NOT NULL,
397
192
  `COLLATION_SCHEMA` varchar(256) NOT NULL DEFAULT '',
192
  `COLLATION_SCHEMA` varchar(256) NOT NULL,
398
193
  `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
193
  `COLLATION_NAME` varchar(256) NOT NULL,
399
194
  `CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
194
  `CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
400
195
  `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
195
  `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
401
196
  `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
196
  `CHARACTER_SET_NAME` varchar(256) NOT NULL,
402
197
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
197
  `TABLE_CATALOG` varchar(256) NOT NULL,
403
198
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
198
  `TABLE_SCHEMA` varchar(256) NOT NULL,
404
199
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
199
  `TABLE_NAME` varchar(256) NOT NULL,
405
200
  `NUMERIC_PRECISION` varchar(256) NOT NULL DEFAULT '',
200
  `NUMERIC_PRECISION` varchar(256) NOT NULL,
406
201
  `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL DEFAULT '',
201
  `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL,
407
202
  `NUMERIC_SCALE` varchar(256) NOT NULL DEFAULT '',
202
  `NUMERIC_SCALE` varchar(256) NOT NULL,
408
203
  `DATETIME_PRECISION` varchar(256) NOT NULL DEFAULT '',
203
  `DATETIME_PRECISION` varchar(256) NOT NULL,
409
204
  `INTERVAL_TYPE` varchar(256) NOT NULL DEFAULT '',
204
  `INTERVAL_TYPE` varchar(256) NOT NULL,
410
205
  `INTERVAL_PRECISION` varchar(256) NOT NULL DEFAULT '',
205
  `INTERVAL_PRECISION` varchar(256) NOT NULL,
411
206
  `TYPE_UDT_CATALOG` varchar(256) NOT NULL DEFAULT '',
206
  `TYPE_UDT_CATALOG` varchar(256) NOT NULL,
412
207
  `TYPE_UDT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
207
  `TYPE_UDT_SCHEMA` varchar(256) NOT NULL,
413
208
  `TYPE_UDT_NAME` varchar(256) NOT NULL DEFAULT '',
208
  `TYPE_UDT_NAME` varchar(256) NOT NULL,
414
209
  `SCOPE_CATALOG` varchar(256) NOT NULL DEFAULT '',
209
  `SCOPE_CATALOG` varchar(256) NOT NULL,
415
210
  `SCOPE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
210
  `SCOPE_SCHEMA` varchar(256) NOT NULL,
416
211
  `SCOPE_NAME` varchar(256) NOT NULL DEFAULT '',
211
  `SCOPE_NAME` varchar(256) NOT NULL,
417
212
  `MAXIMUM_CARDINALITY` varchar(256) NOT NULL DEFAULT '',
212
  `MAXIMUM_CARDINALITY` varchar(256) NOT NULL,
418
213
  `DTD_IDENTIFIER` varchar(256) NOT NULL DEFAULT '',
213
  `DTD_IDENTIFIER` varchar(256) NOT NULL,
419
214
  `ROUTINE_BODY` varchar(256) NOT NULL DEFAULT '',
214
  `ROUTINE_BODY` varchar(256) NOT NULL,
420
215
  `ROUTINE_DEFINITION` varchar(256) NOT NULL DEFAULT '',
215
  `ROUTINE_DEFINITION` varchar(256) NOT NULL,
421
216
  `EXTERNAL_NAME` varchar(256) NOT NULL DEFAULT '',
216
  `EXTERNAL_NAME` varchar(256) NOT NULL,
422
217
  `EXTERNAL_LANGUAGE` varchar(256) NOT NULL DEFAULT '',
217
  `EXTERNAL_LANGUAGE` varchar(256) NOT NULL,
423
218
  `PARAMETER_STYLE` varchar(256) NOT NULL DEFAULT '',
218
  `PARAMETER_STYLE` varchar(256) NOT NULL,
424
219
  `IS_DETERMINISTIC` varchar(256) NOT NULL DEFAULT '',
219
  `IS_DETERMINISTIC` varchar(256) NOT NULL,
425
220
  `SQL_DATA_ACCESS` varchar(256) NOT NULL DEFAULT '',
220
  `SQL_DATA_ACCESS` varchar(256) NOT NULL,
426
221
  `IS_NULL_CALL` varchar(256) NOT NULL DEFAULT '',
221
  `IS_NULL_CALL` varchar(256) NOT NULL,
427
222
  `SQL_PATH` varchar(256) NOT NULL DEFAULT '',
222
  `SQL_PATH` varchar(256) NOT NULL,
428
223
  `SCHEMA_LEVEL_ROUTINE` varchar(256) NOT NULL DEFAULT '',
223
  `SCHEMA_LEVEL_ROUTINE` varchar(256) NOT NULL,
429
224
  `MAX_DYNAMIC_RESULT_SETS` varchar(256) NOT NULL DEFAULT '',
224
  `MAX_DYNAMIC_RESULT_SETS` varchar(256) NOT NULL,
430
225
  `IS_USER_DEFINED_CAST` varchar(256) NOT NULL DEFAULT '',
225
  `IS_USER_DEFINED_CAST` varchar(256) NOT NULL,
431
226
  `IS_IMPLICITLY_INVOCABLE` varchar(256) NOT NULL DEFAULT '',
226
  `IS_IMPLICITLY_INVOCABLE` varchar(256) NOT NULL,
432
227
  `CREATED` varchar(256) NOT NULL DEFAULT '',
227
  `CREATED` varchar(256) NOT NULL,
433
228
  `LAST_ALTERED` varchar(256) NOT NULL DEFAULT ''
228
  `LAST_ALTERED` varchar(256) NOT NULL
434
229
) ENGINE=FunctionEngine
229
) ENGINE=FunctionEngine
435
230
SHOW CREATE TABLE `ROUTINE_COLUMNS`;
230
SHOW CREATE TABLE `ROUTINE_COLUMNS`;
436
231
Table	Create Table
231
Table	Create Table
437
232
ROUTINE_COLUMNS	CREATE TABLE `routine_columns` (
232
ROUTINE_COLUMNS	CREATE TABLE `routine_columns` (
461
233
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
233
  `TABLE_CATALOG` varchar(256) NOT NULL,
462
234
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
234
  `TABLE_SCHEMA` varchar(256) NOT NULL,
463
235
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
235
  `TABLE_NAME` varchar(256) NOT NULL,
464
236
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
236
  `COLUMN_NAME` varchar(256) NOT NULL,
465
237
  `ORDINAL_POSITION` varchar(256) NOT NULL DEFAULT '',
237
  `ORDINAL_POSITION` varchar(256) NOT NULL,
466
238
  `COLUMN_DEFAULT` varchar(256) NOT NULL DEFAULT '',
238
  `COLUMN_DEFAULT` varchar(256) NOT NULL,
467
239
  `IS_NULLABLE` varchar(256) NOT NULL DEFAULT '',
239
  `IS_NULLABLE` varchar(256) NOT NULL,
468
240
  `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
240
  `DATA_TYPE` varchar(256) NOT NULL,
469
241
  `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL DEFAULT '',
241
  `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL,
470
242
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
242
  `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
471
243
  `NUMERIC_PRECISION` varchar(256) NOT NULL DEFAULT '',
243
  `NUMERIC_PRECISION` varchar(256) NOT NULL,
472
244
  `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL DEFAULT '',
244
  `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL,
473
245
  `NUMERIC_SCALE` varchar(256) NOT NULL DEFAULT '',
245
  `NUMERIC_SCALE` varchar(256) NOT NULL,
474
246
  `DATETIME_PRECISION` varchar(256) NOT NULL DEFAULT '',
246
  `DATETIME_PRECISION` varchar(256) NOT NULL,
475
247
  `CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
247
  `CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
476
248
  `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
248
  `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
477
249
  `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
249
  `CHARACTER_SET_NAME` varchar(256) NOT NULL,
478
250
  `COLLATION_CATALOG` varchar(256) NOT NULL DEFAULT '',
250
  `COLLATION_CATALOG` varchar(256) NOT NULL,
479
251
  `COLLATION_SCHEMA` varchar(256) NOT NULL DEFAULT '',
251
  `COLLATION_SCHEMA` varchar(256) NOT NULL,
480
252
  `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
252
  `COLLATION_NAME` varchar(256) NOT NULL,
481
253
  `DOMAIN_CATALOG` varchar(256) NOT NULL DEFAULT '',
253
  `DOMAIN_CATALOG` varchar(256) NOT NULL,
482
254
  `DOMAIN_SCHEMA` varchar(256) NOT NULL DEFAULT '',
254
  `DOMAIN_SCHEMA` varchar(256) NOT NULL,
483
255
  `DOMAIN_NAME` varchar(256) NOT NULL DEFAULT ''
255
  `DOMAIN_NAME` varchar(256) NOT NULL
484
256
) ENGINE=FunctionEngine
256
) ENGINE=FunctionEngine
485
257
SHOW CREATE TABLE `SCHEMATA`;
257
SHOW CREATE TABLE `SCHEMATA`;
486
258
Table	Create Table
258
Table	Create Table
487
259
SCHEMATA	CREATE TABLE `schemata` (
259
SCHEMATA	CREATE TABLE `schemata` (
494
260
  `CATALOG_NAME` varchar(256) NOT NULL DEFAULT '',
260
  `CATALOG_NAME` varchar(256) NOT NULL,
495
261
  `SCHEMA_NAME` varchar(256) NOT NULL DEFAULT '',
261
  `SCHEMA_NAME` varchar(256) NOT NULL,
496
262
  `SCHEMA_OWNER` varchar(256) NOT NULL DEFAULT '',
262
  `SCHEMA_OWNER` varchar(256) NOT NULL,
497
263
  `DEFAULT_CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
263
  `DEFAULT_CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
498
264
  `DEFAULT_CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
264
  `DEFAULT_CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
499
265
  `DEFAULT_CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT ''
265
  `DEFAULT_CHARACTER_SET_NAME` varchar(256) NOT NULL
500
266
) ENGINE=FunctionEngine
266
) ENGINE=FunctionEngine
501
267
SHOW CREATE TABLE `TABLES`;
267
SHOW CREATE TABLE `TABLES`;
502
268
Table	Create Table
268
Table	Create Table
503
269
TABLES	CREATE TABLE `tables` (
269
TABLES	CREATE TABLE `tables` (
508
270
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
270
  `TABLE_CATALOG` varchar(256) NOT NULL,
509
271
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
271
  `TABLE_SCHEMA` varchar(256) NOT NULL,
510
272
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
272
  `TABLE_NAME` varchar(256) NOT NULL,
511
273
  `TABLE_TYPE` varchar(256) NOT NULL DEFAULT ''
273
  `TABLE_TYPE` varchar(256) NOT NULL
512
274
) ENGINE=FunctionEngine
274
) ENGINE=FunctionEngine
513
275
SHOW CREATE TABLE `TABLE_CONSTRAINTS`;
275
SHOW CREATE TABLE `TABLE_CONSTRAINTS`;
514
276
Table	Create Table
276
Table	Create Table
515
277
TABLE_CONSTRAINTS	CREATE TABLE `table_constraints` (
277
TABLE_CONSTRAINTS	CREATE TABLE `table_constraints` (
525
278
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
278
  `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
526
279
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
279
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
527
280
  `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
280
  `CONSTRAINT_NAME` varchar(256) NOT NULL,
528
281
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
281
  `TABLE_CATALOG` varchar(256) NOT NULL,
529
282
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
282
  `TABLE_SCHEMA` varchar(256) NOT NULL,
530
283
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
283
  `TABLE_NAME` varchar(256) NOT NULL,
531
284
  `CONSTRAINT_TYPE` varchar(256) NOT NULL DEFAULT '',
284
  `CONSTRAINT_TYPE` varchar(256) NOT NULL,
532
285
  `IS_DEFERRABLE` varchar(5) NOT NULL DEFAULT '',
285
  `IS_DEFERRABLE` varchar(5) NOT NULL,
533
286
  `INITIALLY_DEFERRED` varchar(5) NOT NULL DEFAULT ''
286
  `INITIALLY_DEFERRED` varchar(5) NOT NULL
534
287
) ENGINE=FunctionEngine
287
) ENGINE=FunctionEngine
535
288
SHOW CREATE TABLE `TABLE_PRIVILEGES`;
288
SHOW CREATE TABLE `TABLE_PRIVILEGES`;
536
289
Table	Create Table
289
Table	Create Table
537
290
TABLE_PRIVILEGES	CREATE TABLE `table_privileges` (
290
TABLE_PRIVILEGES	CREATE TABLE `table_privileges` (
546
291
  `GRANTOR` varchar(256) NOT NULL DEFAULT '',
291
  `GRANTOR` varchar(256) NOT NULL,
547
292
  `GRANTEE` varchar(256) NOT NULL DEFAULT '',
292
  `GRANTEE` varchar(256) NOT NULL,
548
293
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
293
  `TABLE_CATALOG` varchar(256) NOT NULL,
549
294
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
294
  `TABLE_SCHEMA` varchar(256) NOT NULL,
550
295
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
295
  `TABLE_NAME` varchar(256) NOT NULL,
551
296
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
296
  `COLUMN_NAME` varchar(256) NOT NULL,
552
297
  `PRIVILEGE_TYPE` varchar(256) NOT NULL DEFAULT '',
297
  `PRIVILEGE_TYPE` varchar(256) NOT NULL,
553
298
  `IS_GRANTABLE` varchar(256) NOT NULL DEFAULT ''
298
  `IS_GRANTABLE` varchar(256) NOT NULL
554
299
) ENGINE=FunctionEngine
299
) ENGINE=FunctionEngine
555
300
SHOW CREATE TABLE `VIEWS`;
300
SHOW CREATE TABLE `VIEWS`;
556
301
Table	Create Table
301
Table	Create Table
557
302
VIEWS	CREATE TABLE `views` (
302
VIEWS	CREATE TABLE `views` (
564
303
  `VIEW_CATALOG` varchar(256) NOT NULL DEFAULT '',
303
  `VIEW_CATALOG` varchar(256) NOT NULL,
565
304
  `VIEW_SCHEMA` varchar(256) NOT NULL DEFAULT '',
304
  `VIEW_SCHEMA` varchar(256) NOT NULL,
566
305
  `VIEW_NAME` varchar(256) NOT NULL DEFAULT '',
305
  `VIEW_NAME` varchar(256) NOT NULL,
567
306
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
306
  `TABLE_CATALOG` varchar(256) NOT NULL,
568
307
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
307
  `TABLE_SCHEMA` varchar(256) NOT NULL,
569
308
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT ''
308
  `TABLE_NAME` varchar(256) NOT NULL
570
309
) ENGINE=FunctionEngine
309
) ENGINE=FunctionEngine
571
310
SHOW CREATE TABLE `VIEW_COLUMN_USAGE`;
310
SHOW CREATE TABLE `VIEW_COLUMN_USAGE`;
572
311
Table	Create Table
311
Table	Create Table
573
312
VIEW_COLUMN_USAGE	CREATE TABLE `view_column_usage` (
312
VIEW_COLUMN_USAGE	CREATE TABLE `view_column_usage` (
581
313
  `VIEW_CATALOG` varchar(256) NOT NULL DEFAULT '',
313
  `VIEW_CATALOG` varchar(256) NOT NULL,
582
314
  `VIEW_SCHEMA` varchar(256) NOT NULL DEFAULT '',
314
  `VIEW_SCHEMA` varchar(256) NOT NULL,
583
315
  `VIEW_NAME` varchar(256) NOT NULL DEFAULT '',
315
  `VIEW_NAME` varchar(256) NOT NULL,
584
316
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
316
  `TABLE_CATALOG` varchar(256) NOT NULL,
585
317
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
317
  `TABLE_SCHEMA` varchar(256) NOT NULL,
586
318
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
318
  `TABLE_NAME` varchar(256) NOT NULL,
587
319
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT ''
319
  `COLUMN_NAME` varchar(256) NOT NULL
588
320
) ENGINE=FunctionEngine
320
) ENGINE=FunctionEngine
589
321
SHOW CREATE TABLE `VIEW_TABLE_USAGE`;
321
SHOW CREATE TABLE `VIEW_TABLE_USAGE`;
590
322
Table	Create Table
322
Table	Create Table
591
323
VIEW_TABLE_USAGE	CREATE TABLE `view_table_usage` (
323
VIEW_TABLE_USAGE	CREATE TABLE `view_table_usage` (
598
324
  `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
324
  `TABLE_CATALOG` varchar(256) NOT NULL,
599
325
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
325
  `TABLE_SCHEMA` varchar(256) NOT NULL,
600
326
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
326
  `TABLE_NAME` varchar(256) NOT NULL,
601
327
  `VIEW_DEFINITION` varchar(256) NOT NULL DEFAULT '',
327
  `VIEW_DEFINITION` varchar(256) NOT NULL,
602
328
  `CHECK_OPTION` varchar(256) NOT NULL DEFAULT '',
328
  `CHECK_OPTION` varchar(256) NOT NULL,
603
329
  `IS_UPDATABLE` varchar(256) NOT NULL DEFAULT ''
329
  `IS_UPDATABLE` varchar(256) NOT NULL
604
330
) ENGINE=FunctionEngine
330
) ENGINE=FunctionEngine
605
331
331
606
=== modified file 'plugin/innobase/tests/r/innodb_cmp.result'
607
--- plugin/innobase/tests/r/innodb_cmp.result	2010-03-01 02:11:17 +0000
608
+++ plugin/innobase/tests/r/innodb_cmp.result	2010-08-03 22:26:42 +0000
609
@@ -9,10 +9,10 @@
610
9
show create table INNODB_CMP;
9
show create table INNODB_CMP;
611
10
Table	Create Table
10
Table	Create Table
612
11
INNODB_CMP	CREATE TABLE `innodb_cmp` (
11
INNODB_CMP	CREATE TABLE `innodb_cmp` (
619
12
  `PAGE_SIZE` bigint NOT NULL DEFAULT '0',
12
  `PAGE_SIZE` bigint NOT NULL,
620
13
  `COMPRESS_OPS` bigint NOT NULL DEFAULT '0',
13
  `COMPRESS_OPS` bigint NOT NULL,
621
14
  `COMPRESS_OPS_OK` bigint NOT NULL DEFAULT '0',
14
  `COMPRESS_OPS_OK` bigint NOT NULL,
622
15
  `COMPRESS_TIME` bigint NOT NULL DEFAULT '0',
15
  `COMPRESS_TIME` bigint NOT NULL,
623
16
  `UNCOMPRESS_OPS` bigint NOT NULL DEFAULT '0',
16
  `UNCOMPRESS_OPS` bigint NOT NULL,
624
17
  `UNCOMPRESS_TIME` bigint NOT NULL DEFAULT '0'
17
  `UNCOMPRESS_TIME` bigint NOT NULL
625
18
) ENGINE=FunctionEngine
18
) ENGINE=FunctionEngine
626
19
19
627
=== modified file 'plugin/innobase/tests/r/innodb_cmp_reset.result'
628
--- plugin/innobase/tests/r/innodb_cmp_reset.result	2010-03-01 02:11:17 +0000
629
+++ plugin/innobase/tests/r/innodb_cmp_reset.result	2010-08-03 22:26:42 +0000
630
@@ -9,10 +9,10 @@
631
9
show create table INNODB_CMP_RESET;
9
show create table INNODB_CMP_RESET;
632
10
Table	Create Table
10
Table	Create Table
633
11
INNODB_CMP_RESET	CREATE TABLE `innodb_cmp_reset` (
11
INNODB_CMP_RESET	CREATE TABLE `innodb_cmp_reset` (
640
12
  `PAGE_SIZE` bigint NOT NULL DEFAULT '0',
12
  `PAGE_SIZE` bigint NOT NULL,
641
13
  `COMPRESS_OPS` bigint NOT NULL DEFAULT '0',
13
  `COMPRESS_OPS` bigint NOT NULL,
642
14
  `COMPRESS_OPS_OK` bigint NOT NULL DEFAULT '0',
14
  `COMPRESS_OPS_OK` bigint NOT NULL,
643
15
  `COMPRESS_TIME` bigint NOT NULL DEFAULT '0',
15
  `COMPRESS_TIME` bigint NOT NULL,
644
16
  `UNCOMPRESS_OPS` bigint NOT NULL DEFAULT '0',
16
  `UNCOMPRESS_OPS` bigint NOT NULL,
645
17
  `UNCOMPRESS_TIME` bigint NOT NULL DEFAULT '0'
17
  `UNCOMPRESS_TIME` bigint NOT NULL
646
18
) ENGINE=FunctionEngine
18
) ENGINE=FunctionEngine
647
19
19
648
=== modified file 'plugin/innobase/tests/r/innodb_cmpmem.result'
649
--- plugin/innobase/tests/r/innodb_cmpmem.result	2010-03-23 23:47:56 +0000
650
+++ plugin/innobase/tests/r/innodb_cmpmem.result	2010-08-03 22:26:42 +0000
651
@@ -12,9 +12,9 @@
652
12
show create table INNODB_CMPMEM;
12
show create table INNODB_CMPMEM;
653
13
Table	Create Table
13
Table	Create Table
654
14
INNODB_CMPMEM	CREATE TABLE `innodb_cmpmem` (
14
INNODB_CMPMEM	CREATE TABLE `innodb_cmpmem` (
660
15
  `PAGE_SIZE` bigint NOT NULL DEFAULT '0',
15
  `PAGE_SIZE` bigint NOT NULL,
661
16
  `PAGES_USED` bigint NOT NULL DEFAULT '0',
16
  `PAGES_USED` bigint NOT NULL,
662
17
  `PAGES_FREE` bigint NOT NULL DEFAULT '0',
17
  `PAGES_FREE` bigint NOT NULL,
663
18
  `RELOCATION_OPS` bigint NOT NULL DEFAULT '0',
18
  `RELOCATION_OPS` bigint NOT NULL,
664
19
  `RELOCATION_TIME` bigint NOT NULL DEFAULT '0'
19
  `RELOCATION_TIME` bigint NOT NULL
665
20
) ENGINE=FunctionEngine
20
) ENGINE=FunctionEngine
666
21
21
667
=== modified file 'plugin/innobase/tests/r/innodb_cmpmem_reset.result'
668
--- plugin/innobase/tests/r/innodb_cmpmem_reset.result	2010-03-23 23:47:56 +0000
669
+++ plugin/innobase/tests/r/innodb_cmpmem_reset.result	2010-08-03 22:26:42 +0000
670
@@ -12,9 +12,9 @@
671
12
show create table INNODB_CMPMEM_RESET;
12
show create table INNODB_CMPMEM_RESET;
672
13
Table	Create Table
13
Table	Create Table
673
14
INNODB_CMPMEM_RESET	CREATE TABLE `innodb_cmpmem_reset` (
14
INNODB_CMPMEM_RESET	CREATE TABLE `innodb_cmpmem_reset` (
679
15
  `PAGE_SIZE` bigint NOT NULL DEFAULT '0',
15
  `PAGE_SIZE` bigint NOT NULL,
680
16
  `PAGES_USED` bigint NOT NULL DEFAULT '0',
16
  `PAGES_USED` bigint NOT NULL,
681
17
  `PAGES_FREE` bigint NOT NULL DEFAULT '0',
17
  `PAGES_FREE` bigint NOT NULL,
682
18
  `RELOCATION_OPS` bigint NOT NULL DEFAULT '0',
18
  `RELOCATION_OPS` bigint NOT NULL,
683
19
  `RELOCATION_TIME` bigint NOT NULL DEFAULT '0'
19
  `RELOCATION_TIME` bigint NOT NULL
684
20
) ENGINE=FunctionEngine
20
) ENGINE=FunctionEngine
685
21
21
686
=== modified file 'plugin/innobase/tests/r/innodb_lock_waits.result'
687
--- plugin/innobase/tests/r/innodb_lock_waits.result	2010-05-26 21:49:18 +0000
688
+++ plugin/innobase/tests/r/innodb_lock_waits.result	2010-08-03 22:26:42 +0000
689
@@ -4,8 +4,8 @@
690
4
show create table INNODB_LOCK_WAITS;
4
show create table INNODB_LOCK_WAITS;
691
5
Table	Create Table
5
Table	Create Table
692
6
INNODB_LOCK_WAITS	CREATE TABLE `innodb_lock_waits` (
6
INNODB_LOCK_WAITS	CREATE TABLE `innodb_lock_waits` (
697
7
  `REQUESTING_TRX_ID` varchar(256) NOT NULL DEFAULT '',
7
  `REQUESTING_TRX_ID` varchar(256) NOT NULL,
698
8
  `REQUESTED_LOCK_ID` varchar(256) NOT NULL DEFAULT '',
8
  `REQUESTED_LOCK_ID` varchar(256) NOT NULL,
699
9
  `BLOCKING_TRX_ID` varchar(256) NOT NULL DEFAULT '',
9
  `BLOCKING_TRX_ID` varchar(256) NOT NULL,
700
10
  `BLOCKING_LOCK_ID` varchar(256) NOT NULL DEFAULT ''
10
  `BLOCKING_LOCK_ID` varchar(256) NOT NULL
701
11
) ENGINE=FunctionEngine
11
) ENGINE=FunctionEngine
702
12
12
703
=== modified file 'plugin/innobase/tests/r/innodb_locks.result'
704
--- plugin/innobase/tests/r/innodb_locks.result	2010-05-26 21:49:18 +0000
705
+++ plugin/innobase/tests/r/innodb_locks.result	2010-08-03 22:26:42 +0000
706
@@ -4,14 +4,14 @@
707
4
show create table INNODB_LOCKS;
4
show create table INNODB_LOCKS;
708
5
Table	Create Table
5
Table	Create Table
709
6
INNODB_LOCKS	CREATE TABLE `innodb_locks` (
6
INNODB_LOCKS	CREATE TABLE `innodb_locks` (
720
7
  `LOCK_ID` varchar(256) NOT NULL DEFAULT '',
7
  `LOCK_ID` varchar(256) NOT NULL,
721
8
  `LOCK_TRX_ID` varchar(256) NOT NULL DEFAULT '',
8
  `LOCK_TRX_ID` varchar(256) NOT NULL,
722
9
  `LOCK_MODE` varchar(256) NOT NULL DEFAULT '',
9
  `LOCK_MODE` varchar(256) NOT NULL,
723
10
  `LOCK_TYPE` varchar(256) NOT NULL DEFAULT '',
10
  `LOCK_TYPE` varchar(256) NOT NULL,
724
11
  `LOCK_TABLE` varchar(256) NOT NULL DEFAULT '',
11
  `LOCK_TABLE` varchar(256) NOT NULL,
725
12
  `LOCK_INDEX` varchar(256) NOT NULL DEFAULT '',
12
  `LOCK_INDEX` varchar(256) NOT NULL,
726
13
  `LOCK_SPACE` bigint NOT NULL DEFAULT '0',
13
  `LOCK_SPACE` bigint NOT NULL,
727
14
  `LOCK_PAGE` bigint NOT NULL DEFAULT '0',
14
  `LOCK_PAGE` bigint NOT NULL,
728
15
  `LOCK_REC` bigint NOT NULL DEFAULT '0',
15
  `LOCK_REC` bigint NOT NULL,
729
16
  `LOCK_DATA` varchar(256) NOT NULL DEFAULT ''
16
  `LOCK_DATA` varchar(256) NOT NULL
730
17
) ENGINE=FunctionEngine
17
) ENGINE=FunctionEngine
731
18
18
732
=== modified file 'plugin/innobase/tests/r/innodb_status.result'
733
--- plugin/innobase/tests/r/innodb_status.result	2010-05-26 21:49:18 +0000
734
+++ plugin/innobase/tests/r/innodb_status.result	2010-08-03 22:26:42 +0000
735
@@ -5,6 +5,6 @@
736
5
show create table INNODB_STATUS;
5
show create table INNODB_STATUS;
737
6
Table	Create Table
6
Table	Create Table
738
7
INNODB_STATUS	CREATE TABLE `innodb_status` (
7
INNODB_STATUS	CREATE TABLE `innodb_status` (
741
8
  `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
8
  `VARIABLE_NAME` varchar(256) NOT NULL,
742
9
  `VARIABLE_VALUE` varchar(256) NOT NULL DEFAULT ''
9
  `VARIABLE_VALUE` varchar(256) NOT NULL
743
10
) ENGINE=FunctionEngine
10
) ENGINE=FunctionEngine
744
11
11
745
=== modified file 'plugin/innobase/tests/r/innodb_trx.result'
746
--- plugin/innobase/tests/r/innodb_trx.result	2010-05-26 21:49:18 +0000
747
+++ plugin/innobase/tests/r/innodb_trx.result	2010-08-03 22:26:42 +0000
748
@@ -4,12 +4,12 @@
749
4
show create table INNODB_TRX;
4
show create table INNODB_TRX;
750
5
Table	Create Table
5
Table	Create Table
751
6
INNODB_TRX	CREATE TABLE `innodb_trx` (
6
INNODB_TRX	CREATE TABLE `innodb_trx` (
760
7
  `TRX_ID` varchar(256) NOT NULL DEFAULT '',
7
  `TRX_ID` varchar(256) NOT NULL,
761
8
  `TRX_STATE` varchar(256) NOT NULL DEFAULT '',
8
  `TRX_STATE` varchar(256) NOT NULL,
762
9
  `TRX_STARTED` bigint NOT NULL DEFAULT '0',
9
  `TRX_STARTED` bigint NOT NULL,
763
10
  `TRX_REQUESTED_LOCK_ID` varchar(256) NOT NULL DEFAULT '',
10
  `TRX_REQUESTED_LOCK_ID` varchar(256) NOT NULL,
764
11
  `TRX_WAIT_STARTED` bigint NOT NULL DEFAULT '0',
11
  `TRX_WAIT_STARTED` bigint NOT NULL,
765
12
  `TRX_WEIGHT` bigint NOT NULL DEFAULT '0',
12
  `TRX_WEIGHT` bigint NOT NULL,
766
13
  `TRX_DRIZZLE_THREAD_ID` bigint NOT NULL DEFAULT '0',
13
  `TRX_DRIZZLE_THREAD_ID` bigint NOT NULL,
767
14
  `TRX_QUERY` varchar(256) NOT NULL DEFAULT ''
14
  `TRX_QUERY` varchar(256) NOT NULL
768
15
) ENGINE=FunctionEngine
15
) ENGINE=FunctionEngine
769
16
16
770
=== modified file 'plugin/logging_stats/tests/r/command.result'
771
--- plugin/logging_stats/tests/r/command.result	2010-05-26 21:49:18 +0000
772
+++ plugin/logging_stats/tests/r/command.result	2010-08-03 22:26:42 +0000
773
@@ -22,8 +22,8 @@
774
22
SHOW CREATE TABLE data_dictionary.SESSION_STATEMENTS;
22
SHOW CREATE TABLE data_dictionary.SESSION_STATEMENTS;
775
23
Table	Create Table
23
Table	Create Table
776
24
SESSION_STATEMENTS	CREATE TABLE `session_statements` (
24
SESSION_STATEMENTS	CREATE TABLE `session_statements` (
779
25
  `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
25
  `VARIABLE_NAME` varchar(256) NOT NULL,
780
26
  `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
26
  `VARIABLE_VALUE` varchar(1024) NOT NULL
781
27
) ENGINE=FunctionEngine
27
) ENGINE=FunctionEngine
782
28
SELECT count(*) FROM data_dictionary.SESSION_STATEMENTS;
28
SELECT count(*) FROM data_dictionary.SESSION_STATEMENTS;
783
29
count(*)
29
count(*)
784
30
30
785
=== modified file 'plugin/logging_stats/tests/r/max_user.result'
786
--- plugin/logging_stats/tests/r/max_user.result	2010-06-16 03:08:55 +0000
787
+++ plugin/logging_stats/tests/r/max_user.result	2010-08-03 22:26:42 +0000
788
@@ -511,8 +511,8 @@
789
511
SHOW CREATE TABLE data_dictionary.GLOBAL_STATEMENTS;
511
SHOW CREATE TABLE data_dictionary.GLOBAL_STATEMENTS;
790
512
Table	Create Table
512
Table	Create Table
791
513
GLOBAL_STATEMENTS	CREATE TABLE `global_statements` (
513
GLOBAL_STATEMENTS	CREATE TABLE `global_statements` (
794
514
  `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
514
  `VARIABLE_NAME` varchar(256) NOT NULL,
795
515
  `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
515
  `VARIABLE_VALUE` varchar(1024) NOT NULL
796
516
) ENGINE=FunctionEngine
516
) ENGINE=FunctionEngine
797
517
SELECT count(*) FROM data_dictionary.GLOBAL_STATEMENTS;
517
SELECT count(*) FROM data_dictionary.GLOBAL_STATEMENTS;
798
518
count(*)
518
count(*)
799
519
519
800
=== modified file 'plugin/registry_dictionary/tests/r/data_dictionary.result'
801
--- plugin/registry_dictionary/tests/r/data_dictionary.result	2010-05-26 21:49:18 +0000
802
+++ plugin/registry_dictionary/tests/r/data_dictionary.result	2010-08-03 22:26:42 +0000
803
@@ -8,19 +8,19 @@
804
8
show create table MODULES ;
8
show create table MODULES ;
805
9
Table	Create Table
9
Table	Create Table
806
10
MODULES	CREATE TABLE `modules` (
10
MODULES	CREATE TABLE `modules` (
814
11
  `MODULE_NAME` varchar(256) NOT NULL DEFAULT '',
11
  `MODULE_NAME` varchar(256) NOT NULL,
815
12
  `MODULE_VERSION` varchar(20) NOT NULL DEFAULT '',
12
  `MODULE_VERSION` varchar(20) NOT NULL,
816
13
  `MODULE_AUTHOR` varchar(256) NOT NULL DEFAULT '',
13
  `MODULE_AUTHOR` varchar(256) NOT NULL,
817
14
  `IS_BUILTIN` varchar(5) NOT NULL DEFAULT '',
14
  `IS_BUILTIN` varchar(5) NOT NULL,
818
15
  `MODULE_LIBRARY` varchar(254) NOT NULL DEFAULT '',
15
  `MODULE_LIBRARY` varchar(254) NOT NULL,
819
16
  `MODULE_DESCRIPTION` varchar(254) NOT NULL DEFAULT '',
16
  `MODULE_DESCRIPTION` varchar(254) NOT NULL,
820
17
  `MODULE_LICENSE` varchar(80) NOT NULL DEFAULT ''
17
  `MODULE_LICENSE` varchar(80) NOT NULL
821
18
) ENGINE=FunctionEngine
18
) ENGINE=FunctionEngine
822
19
show create table PLUGINS ;
19
show create table PLUGINS ;
823
20
Table	Create Table
20
Table	Create Table
824
21
PLUGINS	CREATE TABLE `plugins` (
21
PLUGINS	CREATE TABLE `plugins` (
829
22
  `PLUGIN_NAME` varchar(256) NOT NULL DEFAULT '',
22
  `PLUGIN_NAME` varchar(256) NOT NULL,
830
23
  `PLUGIN_TYPE` varchar(256) NOT NULL DEFAULT '',
23
  `PLUGIN_TYPE` varchar(256) NOT NULL,
831
24
  `IS_ACTIVE` varchar(5) NOT NULL DEFAULT '',
24
  `IS_ACTIVE` varchar(5) NOT NULL,
832
25
  `MODULE_NAME` varchar(256) NOT NULL DEFAULT ''
25
  `MODULE_NAME` varchar(256) NOT NULL
833
26
) ENGINE=FunctionEngine
26
) ENGINE=FunctionEngine
834
27
27
835
=== modified file 'plugin/replication_dictionary/tests/r/data_dictionary.result'
836
--- plugin/replication_dictionary/tests/r/data_dictionary.result	2010-05-26 21:49:18 +0000
837
+++ plugin/replication_dictionary/tests/r/data_dictionary.result	2010-08-03 22:26:42 +0000
838
@@ -5,6 +5,6 @@
839
5
show create table replication_streams;
5
show create table replication_streams;
840
6
Table	Create Table
6
Table	Create Table
841
7
replication_streams	CREATE TABLE `replication_streams` (
7
replication_streams	CREATE TABLE `replication_streams` (
844
8
  `REPLICATOR` varchar(256) NOT NULL DEFAULT '',
8
  `REPLICATOR` varchar(256) NOT NULL,
845
9
  `APPLIER` varchar(256) NOT NULL DEFAULT ''
9
  `APPLIER` varchar(256) NOT NULL
846
10
) ENGINE=FunctionEngine
10
) ENGINE=FunctionEngine
847
11
11
848
=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
849
--- plugin/schema_dictionary/tests/r/data_dictionary.result	2010-07-10 00:27:54 +0000
850
+++ plugin/schema_dictionary/tests/r/data_dictionary.result	2010-08-03 22:26:42 +0000
851
@@ -511,99 +511,99 @@
852
511
show create table COLUMNS ;
511
show create table COLUMNS ;
853
512
Table	Create Table
512
Table	Create Table
854
513
COLUMNS	CREATE TABLE `columns` (
513
COLUMNS	CREATE TABLE `columns` (
860
514
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
514
  `TABLE_SCHEMA` varchar(256) NOT NULL,
861
515
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
515
  `TABLE_NAME` varchar(256) NOT NULL,
862
516
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
516
  `COLUMN_NAME` varchar(256) NOT NULL,
863
517
  `COLUMN_TYPE` varchar(256) NOT NULL DEFAULT '',
517
  `COLUMN_TYPE` varchar(256) NOT NULL,
864
518
  `ORDINAL_POSITION` bigint NOT NULL DEFAULT '0',
518
  `ORDINAL_POSITION` bigint NOT NULL,
865
519
  `COLUMN_DEFAULT` varbinary(65535) DEFAULT NULL,
519
  `COLUMN_DEFAULT` varbinary(65535) DEFAULT NULL,
876
520
  `COLUMN_DEFAULT_IS_NULL` varchar(5) NOT NULL DEFAULT '',
520
  `COLUMN_DEFAULT_IS_NULL` varchar(5) NOT NULL,
877
521
  `COLUMN_DEFAULT_UPDATE` varchar(256) NOT NULL DEFAULT '',
521
  `COLUMN_DEFAULT_UPDATE` varchar(256) NOT NULL,
878
522
  `IS_NULLABLE` varchar(5) NOT NULL DEFAULT '',
522
  `IS_NULLABLE` varchar(5) NOT NULL,
879
523
  `IS_INDEXED` varchar(5) NOT NULL DEFAULT '',
523
  `IS_INDEXED` varchar(5) NOT NULL,
880
524
  `IS_USED_IN_PRIMARY` varchar(5) NOT NULL DEFAULT '',
524
  `IS_USED_IN_PRIMARY` varchar(5) NOT NULL,
881
525
  `IS_UNIQUE` varchar(5) NOT NULL DEFAULT '',
525
  `IS_UNIQUE` varchar(5) NOT NULL,
882
526
  `IS_MULTI` varchar(5) NOT NULL DEFAULT '',
526
  `IS_MULTI` varchar(5) NOT NULL,
883
527
  `IS_FIRST_IN_MULTI` varchar(5) NOT NULL DEFAULT '',
527
  `IS_FIRST_IN_MULTI` varchar(5) NOT NULL,
884
528
  `INDEXES_FOUND_IN` bigint NOT NULL DEFAULT '0',
528
  `INDEXES_FOUND_IN` bigint NOT NULL,
885
529
  `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
529
  `DATA_TYPE` varchar(256) NOT NULL,
886
530
  `CHARACTER_MAXIMUM_LENGTH` bigint DEFAULT NULL,
530
  `CHARACTER_MAXIMUM_LENGTH` bigint DEFAULT NULL,
887
531
  `CHARACTER_OCTET_LENGTH` bigint DEFAULT NULL,
531
  `CHARACTER_OCTET_LENGTH` bigint DEFAULT NULL,
888
532
  `NUMERIC_PRECISION` bigint DEFAULT NULL,
532
  `NUMERIC_PRECISION` bigint DEFAULT NULL,
889
533
  `NUMERIC_SCALE` bigint DEFAULT NULL,
533
  `NUMERIC_SCALE` bigint DEFAULT NULL,
891
534
  `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
534
  `COLLATION_NAME` varchar(256) NOT NULL,
892
535
  `COLUMN_COMMENT` varchar(1024) DEFAULT NULL
535
  `COLUMN_COMMENT` varchar(1024) DEFAULT NULL
893
536
) ENGINE=FunctionEngine
536
) ENGINE=FunctionEngine
894
537
show create table INDEXES ;
537
show create table INDEXES ;
895
538
Table	Create Table
538
Table	Create Table
896
539
INDEXES	CREATE TABLE `indexes` (
539
INDEXES	CREATE TABLE `indexes` (
905
540
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
540
  `TABLE_SCHEMA` varchar(256) NOT NULL,
906
541
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
541
  `TABLE_NAME` varchar(256) NOT NULL,
907
542
  `INDEX_NAME` varchar(256) NOT NULL DEFAULT '',
542
  `INDEX_NAME` varchar(256) NOT NULL,
908
543
  `IS_USED_IN_PRIMARY` varchar(5) NOT NULL DEFAULT '',
543
  `IS_USED_IN_PRIMARY` varchar(5) NOT NULL,
909
544
  `IS_UNIQUE` varchar(5) NOT NULL DEFAULT '',
544
  `IS_UNIQUE` varchar(5) NOT NULL,
910
545
  `IS_NULLABLE` varchar(5) NOT NULL DEFAULT '',
545
  `IS_NULLABLE` varchar(5) NOT NULL,
911
546
  `KEY_LENGTH` bigint NOT NULL DEFAULT '0',
546
  `KEY_LENGTH` bigint NOT NULL,
912
547
  `INDEX_TYPE` varchar(256) NOT NULL DEFAULT '',
547
  `INDEX_TYPE` varchar(256) NOT NULL,
913
548
  `INDEX_COMMENT` varchar(1024) DEFAULT NULL
548
  `INDEX_COMMENT` varchar(1024) DEFAULT NULL
914
549
) ENGINE=FunctionEngine
549
) ENGINE=FunctionEngine
915
550
show create table INDEX_PARTS ;
550
show create table INDEX_PARTS ;
916
551
Table	Create Table
551
Table	Create Table
917
552
INDEX_PARTS	CREATE TABLE `index_parts` (
552
INDEX_PARTS	CREATE TABLE `index_parts` (
929
553
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
553
  `TABLE_SCHEMA` varchar(256) NOT NULL,
930
554
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
554
  `TABLE_NAME` varchar(256) NOT NULL,
931
555
  `INDEX_NAME` varchar(256) NOT NULL DEFAULT '',
555
  `INDEX_NAME` varchar(256) NOT NULL,
932
556
  `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
556
  `COLUMN_NAME` varchar(256) NOT NULL,
933
557
  `COLUMN_NUMBER` bigint NOT NULL DEFAULT '0',
557
  `COLUMN_NUMBER` bigint NOT NULL,
934
558
  `SEQUENCE_IN_INDEX` bigint NOT NULL DEFAULT '0',
558
  `SEQUENCE_IN_INDEX` bigint NOT NULL,
935
559
  `COMPARE_LENGTH` bigint NOT NULL DEFAULT '0',
559
  `COMPARE_LENGTH` bigint NOT NULL,
936
560
  `IS_ORDER_REVERSE` varchar(5) NOT NULL DEFAULT '',
560
  `IS_ORDER_REVERSE` varchar(5) NOT NULL,
937
561
  `IS_USED_IN_PRIMARY` varchar(5) NOT NULL DEFAULT '',
561
  `IS_USED_IN_PRIMARY` varchar(5) NOT NULL,
938
562
  `IS_UNIQUE` varchar(5) NOT NULL DEFAULT '',
562
  `IS_UNIQUE` varchar(5) NOT NULL,
939
563
  `IS_NULLABLE` varchar(5) NOT NULL DEFAULT ''
563
  `IS_NULLABLE` varchar(5) NOT NULL
940
564
) ENGINE=FunctionEngine
564
) ENGINE=FunctionEngine
941
565
show create table REFERENTIAL_CONSTRAINTS ;
565
show create table REFERENTIAL_CONSTRAINTS ;
942
566
Table	Create Table
566
Table	Create Table
943
567
REFERENTIAL_CONSTRAINTS	CREATE TABLE `referential_constraints` (
567
REFERENTIAL_CONSTRAINTS	CREATE TABLE `referential_constraints` (
953
568
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
568
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
954
569
  `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
569
  `CONSTRAINT_NAME` varchar(256) NOT NULL,
955
570
  `UNIQUE_CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
570
  `UNIQUE_CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
956
571
  `UNIQUE_CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
571
  `UNIQUE_CONSTRAINT_NAME` varchar(256) NOT NULL,
957
572
  `MATCH_OPTION` varchar(256) NOT NULL DEFAULT '',
572
  `MATCH_OPTION` varchar(256) NOT NULL,
958
573
  `UPDATE_RULE` varchar(256) NOT NULL DEFAULT '',
573
  `UPDATE_RULE` varchar(256) NOT NULL,
959
574
  `DELETE_RULE` varchar(256) NOT NULL DEFAULT '',
574
  `DELETE_RULE` varchar(256) NOT NULL,
960
575
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
575
  `TABLE_NAME` varchar(256) NOT NULL,
961
576
  `REFERENCED_TABLE_NAME` varchar(256) NOT NULL DEFAULT ''
576
  `REFERENCED_TABLE_NAME` varchar(256) NOT NULL
962
577
) ENGINE=FunctionEngine
577
) ENGINE=FunctionEngine
963
578
show create table SCHEMAS ;
578
show create table SCHEMAS ;
964
579
Table	Create Table
579
Table	Create Table
965
580
SCHEMAS	CREATE TABLE `schemas` (
580
SCHEMAS	CREATE TABLE `schemas` (
970
581
  `SCHEMA_NAME` varchar(256) NOT NULL DEFAULT '',
581
  `SCHEMA_NAME` varchar(256) NOT NULL,
971
582
  `DEFAULT_COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
582
  `DEFAULT_COLLATION_NAME` varchar(256) NOT NULL,
972
583
  `SCHEMA_CREATION_TIME` varchar(256) NOT NULL DEFAULT '',
583
  `SCHEMA_CREATION_TIME` varchar(256) NOT NULL,
973
584
  `SCHEMA_UPDATE_TIME` varchar(256) NOT NULL DEFAULT ''
584
  `SCHEMA_UPDATE_TIME` varchar(256) NOT NULL
974
585
) ENGINE=FunctionEngine
585
) ENGINE=FunctionEngine
975
586
show create table TABLES ;
586
show create table TABLES ;
976
587
Table	Create Table
587
Table	Create Table
977
588
TABLES	CREATE TABLE `tables` (
588
TABLES	CREATE TABLE `tables` (
986
589
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
589
  `TABLE_SCHEMA` varchar(256) NOT NULL,
987
590
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
590
  `TABLE_NAME` varchar(256) NOT NULL,
988
591
  `TABLE_TYPE` varchar(256) NOT NULL DEFAULT '',
591
  `TABLE_TYPE` varchar(256) NOT NULL,
989
592
  `ENGINE` varchar(256) NOT NULL DEFAULT '',
592
  `ENGINE` varchar(256) NOT NULL,
990
593
  `ROW_FORMAT` varchar(10) NOT NULL DEFAULT '',
593
  `ROW_FORMAT` varchar(10) NOT NULL,
991
594
  `TABLE_COLLATION` varchar(256) NOT NULL DEFAULT '',
594
  `TABLE_COLLATION` varchar(256) NOT NULL,
992
595
  `TABLE_CREATION_TIME` varchar(256) NOT NULL DEFAULT '',
595
  `TABLE_CREATION_TIME` varchar(256) NOT NULL,
993
596
  `TABLE_UPDATE_TIME` varchar(256) NOT NULL DEFAULT '',
596
  `TABLE_UPDATE_TIME` varchar(256) NOT NULL,
994
597
  `TABLE_COMMENT` varchar(2048) DEFAULT NULL
597
  `TABLE_COMMENT` varchar(2048) DEFAULT NULL
995
598
) ENGINE=FunctionEngine
598
) ENGINE=FunctionEngine
996
599
show create table TABLE_CONSTRAINTS ;
599
show create table TABLE_CONSTRAINTS ;
997
600
Table	Create Table
600
Table	Create Table
998
601
TABLE_CONSTRAINTS	CREATE TABLE `table_constraints` (
601
TABLE_CONSTRAINTS	CREATE TABLE `table_constraints` (
1004
602
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
602
  `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
1005
603
  `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
603
  `CONSTRAINT_NAME` varchar(256) NOT NULL,
1006
604
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
604
  `TABLE_SCHEMA` varchar(256) NOT NULL,
1007
605
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
605
  `TABLE_NAME` varchar(256) NOT NULL,
1008
606
  `CONSTRAINT_TYPE` varchar(256) NOT NULL DEFAULT ''
606
  `CONSTRAINT_TYPE` varchar(256) NOT NULL
1009
607
) ENGINE=FunctionEngine
607
) ENGINE=FunctionEngine
1010
608
CREATE SCHEMA A;
608
CREATE SCHEMA A;
1011
609
use A;
609
use A;
1012
610
610
1013
=== modified file 'plugin/session_dictionary/tests/r/data_dictionary.result'
1014
--- plugin/session_dictionary/tests/r/data_dictionary.result	2010-05-26 21:49:18 +0000
1015
+++ plugin/session_dictionary/tests/r/data_dictionary.result	2010-08-03 22:26:42 +0000
1016
@@ -2,14 +2,14 @@
1017
2
show create table PROCESSLIST ;
2
show create table PROCESSLIST ;
1018
3
Table	Create Table
3
Table	Create Table
1019
4
PROCESSLIST	CREATE TABLE `processlist` (
4
PROCESSLIST	CREATE TABLE `processlist` (
1028
5
  `ID` bigint NOT NULL DEFAULT '0',
5
  `ID` bigint NOT NULL,
1029
6
  `USER` varchar(16) NOT NULL DEFAULT '',
6
  `USER` varchar(16) NOT NULL,
1030
7
  `HOST` varchar(1025) NOT NULL DEFAULT '',
7
  `HOST` varchar(1025) NOT NULL,
1031
8
  `DB` varchar(256) NOT NULL DEFAULT '',
8
  `DB` varchar(256) NOT NULL,
1032
9
  `COMMAND` varchar(16) NOT NULL DEFAULT '',
9
  `COMMAND` varchar(16) NOT NULL,
1033
10
  `TIME` bigint NOT NULL DEFAULT '0',
10
  `TIME` bigint NOT NULL,
1034
11
  `STATE` varchar(256) NOT NULL DEFAULT '',
11
  `STATE` varchar(256) NOT NULL,
1035
12
  `INFO` varchar(100) NOT NULL DEFAULT ''
12
  `INFO` varchar(100) NOT NULL
1036
13
) ENGINE=FunctionEngine
13
) ENGINE=FunctionEngine
1037
14
SELECT ID FROM processlist;
14
SELECT ID FROM processlist;
1038
15
ID
15
ID
1039
16
16
1040
=== modified file 'plugin/status_dictionary/tests/r/data_dictionary.result'
1041
--- plugin/status_dictionary/tests/r/data_dictionary.result	2010-05-26 21:49:18 +0000
1042
+++ plugin/status_dictionary/tests/r/data_dictionary.result	2010-08-03 22:26:42 +0000
1043
@@ -2,26 +2,26 @@
1044
2
show create table GLOBAL_STATUS ;
2
show create table GLOBAL_STATUS ;
1045
3
Table	Create Table
3
Table	Create Table
1046
4
GLOBAL_STATUS	CREATE TABLE `global_status` (
4
GLOBAL_STATUS	CREATE TABLE `global_status` (
1049
5
  `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
5
  `VARIABLE_NAME` varchar(256) NOT NULL,
1050
6
  `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
6
  `VARIABLE_VALUE` varchar(1024) NOT NULL
1051
7
) ENGINE=FunctionEngine
7
) ENGINE=FunctionEngine
1052
8
show create table GLOBAL_VARIABLES ;
8
show create table GLOBAL_VARIABLES ;
1053
9
Table	Create Table
9
Table	Create Table
1054
10
GLOBAL_VARIABLES	CREATE TABLE `global_variables` (
10
GLOBAL_VARIABLES	CREATE TABLE `global_variables` (
1057
11
  `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
11
  `VARIABLE_NAME` varchar(256) NOT NULL,
1058
12
  `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
12
  `VARIABLE_VALUE` varchar(1024) NOT NULL
1059
13
) ENGINE=FunctionEngine
13
) ENGINE=FunctionEngine
1060
14
show create table SESSION_STATUS;
14
show create table SESSION_STATUS;
1061
15
Table	Create Table
15
Table	Create Table
1062
16
SESSION_STATUS	CREATE TABLE `session_status` (
16
SESSION_STATUS	CREATE TABLE `session_status` (
1065
17
  `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
17
  `VARIABLE_NAME` varchar(256) NOT NULL,
1066
18
  `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
18
  `VARIABLE_VALUE` varchar(1024) NOT NULL
1067
19
) ENGINE=FunctionEngine
19
) ENGINE=FunctionEngine
1068
20
show create table SESSION_VARIABLES;
20
show create table SESSION_VARIABLES;
1069
21
Table	Create Table
21
Table	Create Table
1070
22
SESSION_VARIABLES	CREATE TABLE `session_variables` (
22
SESSION_VARIABLES	CREATE TABLE `session_variables` (
1073
23
  `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
23
  `VARIABLE_NAME` varchar(256) NOT NULL,
1074
24
  `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
24
  `VARIABLE_VALUE` varchar(1024) NOT NULL
1075
25
) ENGINE=FunctionEngine
25
) ENGINE=FunctionEngine
1076
26
SELECT count(*) FROM data_dictionary.GLOBAL_STATUS;
26
SELECT count(*) FROM data_dictionary.GLOBAL_STATUS;
1077
27
count(*)
27
count(*)
1078
28
28
1079
=== modified file 'plugin/table_cache_dictionary/tests/r/table_cache.result'
1080
--- plugin/table_cache_dictionary/tests/r/table_cache.result	2010-05-26 21:49:18 +0000
1081
+++ plugin/table_cache_dictionary/tests/r/table_cache.result	2010-08-03 22:26:42 +0000
1082
@@ -1,15 +1,15 @@
1083
1
show create table data_dictionary.TABLE_CACHE;
1
show create table data_dictionary.TABLE_CACHE;
1084
2
Table	Create Table
2
Table	Create Table
1085
3
TABLE_CACHE	CREATE TABLE `table_cache` (
3
TABLE_CACHE	CREATE TABLE `table_cache` (
1095
4
  `SESSION_ID` bigint NOT NULL DEFAULT '0',
4
  `SESSION_ID` bigint NOT NULL,
1096
5
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
5
  `TABLE_SCHEMA` varchar(256) NOT NULL,
1097
6
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
6
  `TABLE_NAME` varchar(256) NOT NULL,
1098
7
  `VERSION` bigint NOT NULL DEFAULT '0',
7
  `VERSION` bigint NOT NULL,
1099
8
  `IS_NAME_LOCKED` varchar(5) NOT NULL DEFAULT '',
8
  `IS_NAME_LOCKED` varchar(5) NOT NULL,
1100
9
  `ROWS` bigint NOT NULL DEFAULT '0',
9
  `ROWS` bigint NOT NULL,
1101
10
  `AVG_ROW_LENGTH` bigint NOT NULL DEFAULT '0',
10
  `AVG_ROW_LENGTH` bigint NOT NULL,
1102
11
  `TABLE_SIZE` bigint NOT NULL DEFAULT '0',
11
  `TABLE_SIZE` bigint NOT NULL,
1103
12
  `AUTO_INCREMENT` bigint NOT NULL DEFAULT '0'
12
  `AUTO_INCREMENT` bigint NOT NULL
1104
13
) ENGINE=FunctionEngine
13
) ENGINE=FunctionEngine
1105
14
select count(*) FROM data_dictionary.TABLE_CACHE;
14
select count(*) FROM data_dictionary.TABLE_CACHE;
1106
15
count(*)
15
count(*)
1107
16
16
1108
=== modified file 'plugin/table_cache_dictionary/tests/r/table_definition_cache.result'
1109
--- plugin/table_cache_dictionary/tests/r/table_definition_cache.result	2010-05-26 21:49:18 +0000
1110
+++ plugin/table_cache_dictionary/tests/r/table_definition_cache.result	2010-08-03 22:26:42 +0000
1111
@@ -1,11 +1,11 @@
1112
1
show create table data_dictionary.TABLE_DEFINITION_CACHE;
1
show create table data_dictionary.TABLE_DEFINITION_CACHE;
1113
2
Table	Create Table
2
Table	Create Table
1114
3
TABLE_DEFINITION_CACHE	CREATE TABLE `table_definition_cache` (
3
TABLE_DEFINITION_CACHE	CREATE TABLE `table_definition_cache` (
1120
4
  `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
4
  `TABLE_SCHEMA` varchar(256) NOT NULL,
1121
5
  `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
5
  `TABLE_NAME` varchar(256) NOT NULL,
1122
6
  `VERSION` bigint NOT NULL DEFAULT '0',
6
  `VERSION` bigint NOT NULL,
1123
7
  `TABLE_COUNT` bigint NOT NULL DEFAULT '0',
7
  `TABLE_COUNT` bigint NOT NULL,
1124
8
  `IS_NAME_LOCKED` varchar(5) NOT NULL DEFAULT ''
8
  `IS_NAME_LOCKED` varchar(5) NOT NULL
1125
9
) ENGINE=FunctionEngine
9
) ENGINE=FunctionEngine
1126
10
select count(*) FROM data_dictionary.TABLE_DEFINITION_CACHE;
10
select count(*) FROM data_dictionary.TABLE_DEFINITION_CACHE;
1127
11
count(*)
11
count(*)
1128
12
12
1129
=== modified file 'tests/r/create.result'
1130
--- tests/r/create.result	2010-07-12 06:26:42 +0000
1131
+++ tests/r/create.result	2010-08-03 22:26:42 +0000
1132
@@ -1449,14 +1449,14 @@
1133
1449
show create table t1;
1449
show create table t1;
1134
1450
Table	Create Table
1450
Table	Create Table
1135
1451
t1	CREATE TABLE `t1` (
1451
t1	CREATE TABLE `t1` (
1144
1452
  `ID` bigint NOT NULL DEFAULT '0',
1452
  `ID` bigint NOT NULL,
1145
1453
  `USER` varchar(16) NOT NULL DEFAULT '',
1453
  `USER` varchar(16) NOT NULL,
1146
1454
  `HOST` varchar(1025) NOT NULL DEFAULT '',
1454
  `HOST` varchar(1025) NOT NULL,
1147
1455
  `DB` varchar(256) NOT NULL DEFAULT '',
1455
  `DB` varchar(256) NOT NULL,
1148
1456
  `COMMAND` varchar(16) NOT NULL DEFAULT '',
1456
  `COMMAND` varchar(16) NOT NULL,
1149
1457
  `TIME` bigint NOT NULL DEFAULT '0',
1457
  `TIME` bigint NOT NULL,
1150
1458
  `STATE` varchar(256) NOT NULL DEFAULT '',
1458
  `STATE` varchar(256) NOT NULL,
1151
1459
  `INFO` varchar(100) NOT NULL DEFAULT ''
1459
  `INFO` varchar(100) NOT NULL
1152
1460
) ENGINE=InnoDB
1460
) ENGINE=InnoDB
1153
1461
drop table t1;
1461
drop table t1;
1154
1462
create temporary table t1 like data_dictionary.processlist;
1462
create temporary table t1 like data_dictionary.processlist;
1155
@@ -1465,14 +1465,14 @@
1156
1465
show create table t1;
1465
show create table t1;
1157
1466
Table	Create Table
1466
Table	Create Table
1158
1467
t1	CREATE TEMPORARY TABLE `t1` (
1467
t1	CREATE TEMPORARY TABLE `t1` (
1167
1468
  `ID` bigint NOT NULL DEFAULT '0',
1468
  `ID` bigint NOT NULL,
1168
1469
  `USER` varchar(16) NOT NULL DEFAULT '',
1469
  `USER` varchar(16) NOT NULL,
1169
1470
  `HOST` varchar(1025) NOT NULL DEFAULT '',
1470
  `HOST` varchar(1025) NOT NULL,
1170
1471
  `DB` varchar(256) NOT NULL DEFAULT '',
1471
  `DB` varchar(256) NOT NULL,
1171
1472
  `COMMAND` varchar(16) NOT NULL DEFAULT '',
1472
  `COMMAND` varchar(16) NOT NULL,
1172
1473
  `TIME` bigint NOT NULL DEFAULT '0',
1473
  `TIME` bigint NOT NULL,
1173
1474
  `STATE` varchar(256) NOT NULL DEFAULT '',
1474
  `STATE` varchar(256) NOT NULL,
1174
1475
  `INFO` varchar(100) NOT NULL DEFAULT ''
1475
  `INFO` varchar(100) NOT NULL
1175
1476
) ENGINE=MyISAM
1476
) ENGINE=MyISAM
1176
1477
drop table t1;
1477
drop table t1;
1177
1478
1478
1178
1479
1479
1179
=== modified file 'tests/r/show_check.result'
1180
--- tests/r/show_check.result	2010-07-12 06:26:42 +0000
1181
+++ tests/r/show_check.result	2010-08-03 22:26:42 +0000
1182
@@ -26,11 +26,11 @@
1183
26
test.t1	check	status	OK
26
test.t1	check	status	OK
1184
27
show index from t1;
27
show index from t1;
1185
28
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
28
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
1191
29
def	data_dictionary	show_indexes	SHOW_INDEXES	Table	Table	8	1024	2	N	1	0	45
29
def	data_dictionary	show_indexes	SHOW_INDEXES	Table	Table	8	1024	2	N	4097	0	45
1192
30
def	data_dictionary	show_indexes	SHOW_INDEXES	Unique	Unique	8	20	3	N	1	0	45
30
def	data_dictionary	show_indexes	SHOW_INDEXES	Unique	Unique	8	20	3	N	4097	0	45
1193
31
def	data_dictionary	show_indexes	SHOW_INDEXES	Key_name	Key_name	8	1024	7	N	1	0	45
31
def	data_dictionary	show_indexes	SHOW_INDEXES	Key_name	Key_name	8	1024	7	N	4097	0	45
1194
32
def	data_dictionary	show_indexes	SHOW_INDEXES	Seq_in_index	Seq_in_index	5	20	1	N	32769	0	63
32
def	data_dictionary	show_indexes	SHOW_INDEXES	Seq_in_index	Seq_in_index	5	20	1	N	36865	0	63
1195
33
def	data_dictionary	show_indexes	SHOW_INDEXES	Column_name	Column_name	8	1024	1	N	1	0	45
33
def	data_dictionary	show_indexes	SHOW_INDEXES	Column_name	Column_name	8	1024	1	N	4097	0	45
1196
34
Table	Unique	Key_name	Seq_in_index	Column_name
34
Table	Unique	Key_name	Seq_in_index	Column_name
1197
35
t1	YES	PRIMARY	1	a
35
t1	YES	PRIMARY	1	a
1198
36
t1	NO	b	1	b
36
t1	NO	b	1	b
1199
@@ -48,37 +48,37 @@
1200
48
-- after Bug#29394 is implemented.
48
-- after Bug#29394 is implemented.
1201
49
show variables like "server_id%";
49
show variables like "server_id%";
1202
50
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
50
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
1205
51
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	9	N	1	0	45
51
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	9	N	4097	0	45
1206
52
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	1	N	1	0	45
52
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	1	N	4097	0	45
1207
53
Variable_name	Value
53
Variable_name	Value
1208
54
server_id	1
54
server_id	1
1209
55
show variables like "SERVER_id%";
55
show variables like "SERVER_id%";
1210
56
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
56
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
1213
57
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	9	N	1	0	45
57
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	9	N	4097	0	45
1214
58
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	1	N	1	0	45
58
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	1	N	4097	0	45
1215
59
Variable_name	Value
59
Variable_name	Value
1216
60
server_id	1
60
server_id	1
1217
61
show variables like "this_doesn't_exists%";
61
show variables like "this_doesn't_exists%";
1218
62
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
62
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
1221
63
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	0	N	1	0	45
63
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_NAME	Variable_name	8	1024	0	N	4097	0	45
1222
64
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	0	N	1	0	45
64
def	data_dictionary	session_variables	SESSION_VARIABLES	VARIABLE_VALUE	Value	8	4096	0	N	4097	0	45
1223
65
Variable_name	Value
65
Variable_name	Value
1224
66
show table status from test like "this_doesn't_exists%";
66
show table status from test like "this_doesn't_exists%";
1225
67
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
67
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
1236
68
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Session	Session	5	20	0	N	32769	0	63
68
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Session	Session	5	20	0	N	36865	0	63
1237
69
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Schema	Schema	8	1024	0	N	1	0	45
69
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Schema	Schema	8	1024	0	N	4097	0	45
1238
70
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Name	Name	8	1024	0	N	1	0	45
70
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Name	Name	8	1024	0	N	4097	0	45
1239
71
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Type	Type	8	1024	0	N	1	0	45
71
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Type	Type	8	1024	0	N	4097	0	45
1240
72
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Engine	Engine	8	1024	0	N	1	0	45
72
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Engine	Engine	8	1024	0	N	4097	0	45
1241
73
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Version	Version	8	1024	0	N	1	0	45
73
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Version	Version	8	1024	0	N	4097	0	45
1242
74
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Rows	Rows	8	1024	0	N	1	0	45
74
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Rows	Rows	8	1024	0	N	4097	0	45
1243
75
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Avg_row_length	Avg_row_length	8	1024	0	N	1	0	45
75
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Avg_row_length	Avg_row_length	8	1024	0	N	4097	0	45
1244
76
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Table_size	Table_size	8	1024	0	N	1	0	45
76
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Table_size	Table_size	8	1024	0	N	4097	0	45
1245
77
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Auto_increment	Auto_increment	8	1024	0	N	1	0	45
77
def	data_dictionary	show_table_status	SHOW_TABLE_STATUS	Auto_increment	Auto_increment	8	1024	0	N	4097	0	45
1246
78
Session	Schema	Name	Type	Engine	Version	Rows	Avg_row_length	Table_size	Auto_increment
78
Session	Schema	Name	Type	Engine	Version	Rows	Avg_row_length	Table_size	Auto_increment
1247
79
show databases;
79
show databases;
1248
80
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
80
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
1250
81
def	data_dictionary	show_schemas	SHOW_SCHEMAS	SCHEMA_NAME	Database	8	1024	18	N	1	0	45
81
def	data_dictionary	show_schemas	SHOW_SCHEMAS	SCHEMA_NAME	Database	8	1024	18	N	4097	0	45
1251
82
Database
82
Database
1252
83
DATA_DICTIONARY
83
DATA_DICTIONARY
1253
84
INFORMATION_SCHEMA
84
INFORMATION_SCHEMA
1254
@@ -86,7 +86,7 @@
1255
86
test
86
test
1256
87
show databases like "test%";
87
show databases like "test%";
1257
88
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
88
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
1259
89
def	data_dictionary	show_schemas	SHOW_SCHEMAS	SCHEMA_NAME	Database (test%)	8	1024	4	N	1	0	45
89
def	data_dictionary	show_schemas	SHOW_SCHEMAS	SCHEMA_NAME	Database (test%)	8	1024	4	N	4097	0	45
1260
90
Database (test%)
90
Database (test%)
1261
91
test
91
test
1262
92
create table t1 (f1 int not null, f2 int not null, f3 int not null, f4 int not null, primary key(f1,f2,f3,f4));
92
create table t1 (f1 int not null, f2 int not null, f3 int not null, f4 int not null, primary key(f1,f2,f3,f4));
1263
@@ -446,11 +446,11 @@
1264
446
);
446
);
1265
447
show index from t1;
447
show index from t1;
1266
448
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
448
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
1272
449
def	data_dictionary	show_indexes	SHOW_INDEXES	Table	Table	8	1024	2	N	1	0	45
449
def	data_dictionary	show_indexes	SHOW_INDEXES	Table	Table	8	1024	2	N	4097	0	45
1273
450
def	data_dictionary	show_indexes	SHOW_INDEXES	Unique	Unique	8	20	3	N	1	0	45
450
def	data_dictionary	show_indexes	SHOW_INDEXES	Unique	Unique	8	20	3	N	4097	0	45
1274
451
def	data_dictionary	show_indexes	SHOW_INDEXES	Key_name	Key_name	8	1024	7	N	1	0	45
451
def	data_dictionary	show_indexes	SHOW_INDEXES	Key_name	Key_name	8	1024	7	N	4097	0	45
1275
452
def	data_dictionary	show_indexes	SHOW_INDEXES	Seq_in_index	Seq_in_index	5	20	1	N	32769	0	63
452
def	data_dictionary	show_indexes	SHOW_INDEXES	Seq_in_index	Seq_in_index	5	20	1	N	36865	0	63
1276
453
def	data_dictionary	show_indexes	SHOW_INDEXES	Column_name	Column_name	8	1024	6	N	1	0	45
453
def	data_dictionary	show_indexes	SHOW_INDEXES	Column_name	Column_name	8	1024	6	N	4097	0	45
1277
454
Table	Unique	Key_name	Seq_in_index	Column_name
454
Table	Unique	Key_name	Seq_in_index	Column_name
1278
455
t1	YES	PRIMARY	1	field1
455
t1	YES	PRIMARY	1	field1
1279
456
drop table t1;
456
drop table t1;
Reviewer	Review Type	Date Requested	Status
Brian Aker		2010-08-03	Approve on 2010-08-03
Review via email: mp+31705@code.launchpad.net