Drizzle

Merge lp:~stewart/drizzle/bug600635-table-proto-default-null-false into lp:~drizzle-trunk/drizzle/development

  1. bug600635-table-proto-default-null-false
  2. Merge into development
Proposed by Stewart Smith
Status: Merged
Approved by: Brian Aker
Approved revision: 1658
Merged at revision: 1685
Proposed branch: lp:~stewart/drizzle/bug600635-table-proto-default-null-false
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 1279 lines (+443/-443)
22 files modified
drizzled/table_share.cc (+1/-1)
plugin/collation_dictionary/tests/r/data_dictionary.result (+11/-11)
plugin/information_schema_dictionary/tests/r/show_create_table.result (+233/-233)
plugin/innobase/tests/r/innodb_cmp.result (+6/-6)
plugin/innobase/tests/r/innodb_cmp_reset.result (+6/-6)
plugin/innobase/tests/r/innodb_cmpmem.result (+5/-5)
plugin/innobase/tests/r/innodb_cmpmem_reset.result (+5/-5)
plugin/innobase/tests/r/innodb_lock_waits.result (+4/-4)
plugin/innobase/tests/r/innodb_locks.result (+10/-10)
plugin/innobase/tests/r/innodb_status.result (+2/-2)
plugin/innobase/tests/r/innodb_trx.result (+8/-8)
plugin/logging_stats/tests/r/command.result (+2/-2)
plugin/logging_stats/tests/r/max_user.result (+2/-2)
plugin/registry_dictionary/tests/r/data_dictionary.result (+11/-11)
plugin/replication_dictionary/tests/r/data_dictionary.result (+2/-2)
plugin/schema_dictionary/tests/r/data_dictionary.result (+61/-61)
plugin/session_dictionary/tests/r/data_dictionary.result (+8/-8)
plugin/status_dictionary/tests/r/data_dictionary.result (+8/-8)
plugin/table_cache_dictionary/tests/r/table_cache.result (+9/-9)
plugin/table_cache_dictionary/tests/r/table_definition_cache.result (+5/-5)
tests/r/create.result (+16/-16)
tests/r/show_check.result (+28/-28)
To merge this branch: bzr merge lp:~stewart/drizzle/bug600635-table-proto-default-null-false
Reviewer Review Type Date Requested Status
Brian Aker Approve
Review via email: mp+31705@code.launchpad.net

Description of the change

in the table proto, having default_null set to false explicitly (instead of just having it as a default) had a different behaviour than if it was not set and defaulting to NULL. This meant that you'd get empty defaults instead of no default. This only showed up in table_function tables.

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/386/

To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) wrote :

Hi!

This is fine but flags should be removed and we should use the name of the charset, not the number.

Cheers,
   -Brian

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 Item *default_value= NULL;
6
7 if (pfield.options().has_default_value() ||
8- pfield.options().has_default_null() ||
9+ pfield.options().default_null() ||
10 pfield.options().has_default_bin_value())
11 {
12 default_value= default_value_item(field_type,
13
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 show create table CHARACTER_SETS ;
19 Table Create Table
20 CHARACTER_SETS CREATE TABLE `character_sets` (
21- `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
22- `DEFAULT_COLLATE_NAME` varchar(256) NOT NULL DEFAULT '',
23- `DESCRIPTION` varchar(256) NOT NULL DEFAULT '',
24- `MAXLEN` bigint NOT NULL DEFAULT '0'
25+ `CHARACTER_SET_NAME` varchar(256) NOT NULL,
26+ `DEFAULT_COLLATE_NAME` varchar(256) NOT NULL,
27+ `DESCRIPTION` varchar(256) NOT NULL,
28+ `MAXLEN` bigint NOT NULL
29 ) ENGINE=FunctionEngine
30 show create table COLLATIONS ;
31 Table Create Table
32 COLLATIONS CREATE TABLE `collations` (
33- `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
34- `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
35- `DESCRIPTION` varchar(256) NOT NULL DEFAULT '',
36- `ID` bigint NOT NULL DEFAULT '0',
37- `IS_DEFAULT` varchar(5) NOT NULL DEFAULT '',
38- `IS_COMPILED` varchar(5) NOT NULL DEFAULT '',
39- `SORTLEN` bigint NOT NULL DEFAULT '0'
40+ `CHARACTER_SET_NAME` varchar(256) NOT NULL,
41+ `COLLATION_NAME` varchar(256) NOT NULL,
42+ `DESCRIPTION` varchar(256) NOT NULL,
43+ `ID` bigint NOT NULL,
44+ `IS_DEFAULT` varchar(5) NOT NULL,
45+ `IS_COMPILED` varchar(5) NOT NULL,
46+ `SORTLEN` bigint NOT NULL
47 ) ENGINE=FunctionEngine
48 SELECT * FROM character_sets ORDER BY CHARACTER_SET_NAME;
49 CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
50
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 SHOW CREATE TABLE `CHECK_CONSTRAINTS`;
56 Table Create Table
57 CHECK_CONSTRAINTS CREATE TABLE `check_constraints` (
58- `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
59- `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
60- `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
61- `CHECK_CLAUSE` varchar(256) NOT NULL DEFAULT ''
62+ `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
63+ `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
64+ `CONSTRAINT_NAME` varchar(256) NOT NULL,
65+ `CHECK_CLAUSE` varchar(256) NOT NULL
66 ) ENGINE=FunctionEngine
67 SHOW CREATE TABLE `COLUMNS`;
68 Table Create Table
69 COLUMNS CREATE TABLE `columns` (
70- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
71- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
72- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
73- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
74- `ORDINAL_POSITION` bigint NOT NULL DEFAULT '0',
75+ `TABLE_CATALOG` varchar(256) NOT NULL,
76+ `TABLE_SCHEMA` varchar(256) NOT NULL,
77+ `TABLE_NAME` varchar(256) NOT NULL,
78+ `COLUMN_NAME` varchar(256) NOT NULL,
79+ `ORDINAL_POSITION` bigint NOT NULL,
80 `COLUMN_DEFAULT` varchar(256) DEFAULT NULL,
81- `IS_NULLABLE` varchar(5) NOT NULL DEFAULT '',
82- `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
83+ `IS_NULLABLE` varchar(5) NOT NULL,
84+ `DATA_TYPE` varchar(256) NOT NULL,
85 `CHARACTER_MAXIMUM_LENGTH` bigint DEFAULT NULL,
86 `CHARACTER_OCTET_LENGTH` bigint DEFAULT NULL,
87 `NUMERIC_PRECISION` bigint DEFAULT NULL,
88@@ -37,294 +37,294 @@
89 SHOW CREATE TABLE `COLUMN_DOMAIN_USAGE`;
90 Table Create Table
91 COLUMN_DOMAIN_USAGE CREATE TABLE `column_domain_usage` (
92- `DOMAIN_CATALOG` varchar(256) NOT NULL DEFAULT '',
93- `DOMAIN_SCHEMA` varchar(256) NOT NULL DEFAULT '',
94- `DOMAIN_NAME` varchar(256) NOT NULL DEFAULT '',
95- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
96- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
97- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
98- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT ''
99+ `DOMAIN_CATALOG` varchar(256) NOT NULL,
100+ `DOMAIN_SCHEMA` varchar(256) NOT NULL,
101+ `DOMAIN_NAME` varchar(256) NOT NULL,
102+ `TABLE_CATALOG` varchar(256) NOT NULL,
103+ `TABLE_SCHEMA` varchar(256) NOT NULL,
104+ `TABLE_NAME` varchar(256) NOT NULL,
105+ `COLUMN_NAME` varchar(256) NOT NULL
106 ) ENGINE=FunctionEngine
107 SHOW CREATE TABLE `COLUMN_PRIVILEGES`;
108 Table Create Table
109 COLUMN_PRIVILEGES CREATE TABLE `column_privileges` (
110- `GRANTOR` varchar(256) NOT NULL DEFAULT '',
111- `GRANTEE` varchar(256) NOT NULL DEFAULT '',
112- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
113- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
114- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
115- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
116- `PRIVILEGE_TYPE` varchar(256) NOT NULL DEFAULT '',
117- `IS_GRANTABLE` varchar(256) NOT NULL DEFAULT ''
118+ `GRANTOR` varchar(256) NOT NULL,
119+ `GRANTEE` varchar(256) NOT NULL,
120+ `TABLE_CATALOG` varchar(256) NOT NULL,
121+ `TABLE_SCHEMA` varchar(256) NOT NULL,
122+ `TABLE_NAME` varchar(256) NOT NULL,
123+ `COLUMN_NAME` varchar(256) NOT NULL,
124+ `PRIVILEGE_TYPE` varchar(256) NOT NULL,
125+ `IS_GRANTABLE` varchar(256) NOT NULL
126 ) ENGINE=FunctionEngine
127 SHOW CREATE TABLE `CONSTRAINT_COLUMN_USAGE`;
128 Table Create Table
129 CONSTRAINT_COLUMN_USAGE CREATE TABLE `constraint_column_usage` (
130- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
131- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
132- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
133- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
134- `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
135- `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
136- `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT ''
137+ `TABLE_CATALOG` varchar(256) NOT NULL,
138+ `TABLE_SCHEMA` varchar(256) NOT NULL,
139+ `TABLE_NAME` varchar(256) NOT NULL,
140+ `COLUMN_NAME` varchar(256) NOT NULL,
141+ `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
142+ `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
143+ `CONSTRAINT_NAME` varchar(256) NOT NULL
144 ) ENGINE=FunctionEngine
145 SHOW CREATE TABLE `CONSTRAINT_TABLE_USAGE`;
146 Table Create Table
147 CONSTRAINT_TABLE_USAGE CREATE TABLE `constraint_table_usage` (
148- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
149- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
150- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
151- `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
152- `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
153- `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT ''
154+ `TABLE_CATALOG` varchar(256) NOT NULL,
155+ `TABLE_SCHEMA` varchar(256) NOT NULL,
156+ `TABLE_NAME` varchar(256) NOT NULL,
157+ `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
158+ `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
159+ `CONSTRAINT_NAME` varchar(256) NOT NULL
160 ) ENGINE=FunctionEngine
161 SHOW CREATE TABLE `DOMAINS`;
162 Table Create Table
163 DOMAINS CREATE TABLE `domains` (
164- `DOMAIN_CATALOG` varchar(256) NOT NULL DEFAULT '',
165- `DOMAIN_SCHEMA` varchar(256) NOT NULL DEFAULT '',
166- `DOMAIN_NAME` varchar(256) NOT NULL DEFAULT '',
167- `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
168- `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL DEFAULT '',
169- `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
170- `COLLATION_CATALOG` varchar(256) NOT NULL DEFAULT '',
171- `COLLATION_SCHEMA` varchar(256) NOT NULL DEFAULT '',
172- `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
173- `CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
174- `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
175- `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
176- `NUMERIC_PRECISION` varchar(256) NOT NULL DEFAULT '',
177- `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL DEFAULT '',
178- `NUMERIC_SCALE` varchar(256) NOT NULL DEFAULT '',
179- `DATETIME_PRECISION` varchar(256) NOT NULL DEFAULT '',
180- `DOMAIN_DEFAULT` varchar(256) NOT NULL DEFAULT ''
181+ `DOMAIN_CATALOG` varchar(256) NOT NULL,
182+ `DOMAIN_SCHEMA` varchar(256) NOT NULL,
183+ `DOMAIN_NAME` varchar(256) NOT NULL,
184+ `DATA_TYPE` varchar(256) NOT NULL,
185+ `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL,
186+ `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
187+ `COLLATION_CATALOG` varchar(256) NOT NULL,
188+ `COLLATION_SCHEMA` varchar(256) NOT NULL,
189+ `COLLATION_NAME` varchar(256) NOT NULL,
190+ `CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
191+ `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
192+ `CHARACTER_SET_NAME` varchar(256) NOT NULL,
193+ `NUMERIC_PRECISION` varchar(256) NOT NULL,
194+ `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL,
195+ `NUMERIC_SCALE` varchar(256) NOT NULL,
196+ `DATETIME_PRECISION` varchar(256) NOT NULL,
197+ `DOMAIN_DEFAULT` varchar(256) NOT NULL
198 ) ENGINE=FunctionEngine
199 SHOW CREATE TABLE `DOMAIN_CONSTRAINTS`;
200 Table Create Table
201 DOMAIN_CONSTRAINTS CREATE TABLE `domain_constraints` (
202- `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
203- `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
204- `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
205- `DOMAIN_CATALOG` varchar(256) NOT NULL DEFAULT '',
206- `DOMAIN_SCHEMA` varchar(256) NOT NULL DEFAULT '',
207- `DOMAIN_NAME` varchar(256) NOT NULL DEFAULT '',
208- `IS_DEFERRABLE` varchar(256) NOT NULL DEFAULT '',
209- `INITIALLY_DEFERRED` varchar(256) NOT NULL DEFAULT ''
210+ `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
211+ `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
212+ `CONSTRAINT_NAME` varchar(256) NOT NULL,
213+ `DOMAIN_CATALOG` varchar(256) NOT NULL,
214+ `DOMAIN_SCHEMA` varchar(256) NOT NULL,
215+ `DOMAIN_NAME` varchar(256) NOT NULL,
216+ `IS_DEFERRABLE` varchar(256) NOT NULL,
217+ `INITIALLY_DEFERRED` varchar(256) NOT NULL
218 ) ENGINE=FunctionEngine
219 SHOW CREATE TABLE `KEY_COLUMN_USAGE`;
220 Table Create Table
221 KEY_COLUMN_USAGE CREATE TABLE `key_column_usage` (
222- `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
223- `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
224- `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
225- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
226- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
227- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
228- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
229- `ORDINAL_POSITION` bigint NOT NULL DEFAULT '0'
230+ `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
231+ `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
232+ `CONSTRAINT_NAME` varchar(256) NOT NULL,
233+ `TABLE_CATALOG` varchar(256) NOT NULL,
234+ `TABLE_SCHEMA` varchar(256) NOT NULL,
235+ `TABLE_NAME` varchar(256) NOT NULL,
236+ `COLUMN_NAME` varchar(256) NOT NULL,
237+ `ORDINAL_POSITION` bigint NOT NULL
238 ) ENGINE=FunctionEngine
239 SHOW CREATE TABLE `PARAMETERS`;
240 Table Create Table
241 PARAMETERS CREATE TABLE `parameters` (
242- `SPECIFIC_CATALOG` varchar(256) NOT NULL DEFAULT '',
243- `SPECIFIC_SCHEMA` varchar(256) NOT NULL DEFAULT '',
244- `SPECIFIC_NAME` varchar(256) NOT NULL DEFAULT '',
245- `ORDINAL_POSITION` varchar(256) NOT NULL DEFAULT '',
246- `PARAMETER_MODE` varchar(256) NOT NULL DEFAULT '',
247- `IS_RESULT` varchar(256) NOT NULL DEFAULT '',
248- `AS_LOCATOR` varchar(256) NOT NULL DEFAULT '',
249- `PARAMETER_NAME` varchar(256) NOT NULL DEFAULT '',
250- `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
251- `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL DEFAULT '',
252- `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
253- `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
254- `COLLATION_CATALOG` varchar(256) NOT NULL DEFAULT '',
255- `COLLATION_SCHEMA` varchar(256) NOT NULL DEFAULT '',
256- `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
257- `CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
258- `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
259- `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
260- `NUMERIC_PRECISION` varchar(256) NOT NULL DEFAULT '',
261- `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL DEFAULT '',
262- `NUMERIC_SCALE` varchar(256) NOT NULL DEFAULT '',
263- `DATETIME_PRECISION` varchar(256) NOT NULL DEFAULT '',
264- `INTERVAL_TYPE` varchar(256) NOT NULL DEFAULT '',
265- `INTERVAL_PRECISION` varchar(256) NOT NULL DEFAULT '',
266- `USER_DEFINED_TYPE_CATALOG` varchar(256) NOT NULL DEFAULT '',
267- `USER_DEFINED_TYPE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
268- `USER_DEFINED_TYPE_NAME` varchar(256) NOT NULL DEFAULT '',
269- `SCOPE_CATALOG` varchar(256) NOT NULL DEFAULT '',
270- `SCOPE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
271- `SCOPE_NAME` varchar(256) NOT NULL DEFAULT ''
272+ `SPECIFIC_CATALOG` varchar(256) NOT NULL,
273+ `SPECIFIC_SCHEMA` varchar(256) NOT NULL,
274+ `SPECIFIC_NAME` varchar(256) NOT NULL,
275+ `ORDINAL_POSITION` varchar(256) NOT NULL,
276+ `PARAMETER_MODE` varchar(256) NOT NULL,
277+ `IS_RESULT` varchar(256) NOT NULL,
278+ `AS_LOCATOR` varchar(256) NOT NULL,
279+ `PARAMETER_NAME` varchar(256) NOT NULL,
280+ `DATA_TYPE` varchar(256) NOT NULL,
281+ `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL,
282+ `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
283+ `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
284+ `COLLATION_CATALOG` varchar(256) NOT NULL,
285+ `COLLATION_SCHEMA` varchar(256) NOT NULL,
286+ `COLLATION_NAME` varchar(256) NOT NULL,
287+ `CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
288+ `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
289+ `CHARACTER_SET_NAME` varchar(256) NOT NULL,
290+ `NUMERIC_PRECISION` varchar(256) NOT NULL,
291+ `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL,
292+ `NUMERIC_SCALE` varchar(256) NOT NULL,
293+ `DATETIME_PRECISION` varchar(256) NOT NULL,
294+ `INTERVAL_TYPE` varchar(256) NOT NULL,
295+ `INTERVAL_PRECISION` varchar(256) NOT NULL,
296+ `USER_DEFINED_TYPE_CATALOG` varchar(256) NOT NULL,
297+ `USER_DEFINED_TYPE_SCHEMA` varchar(256) NOT NULL,
298+ `USER_DEFINED_TYPE_NAME` varchar(256) NOT NULL,
299+ `SCOPE_CATALOG` varchar(256) NOT NULL,
300+ `SCOPE_SCHEMA` varchar(256) NOT NULL,
301+ `SCOPE_NAME` varchar(256) NOT NULL
302 ) ENGINE=FunctionEngine
303 SHOW CREATE TABLE `REFERENTIAL_CONSTRAINTS`;
304 Table Create Table
305 REFERENTIAL_CONSTRAINTS CREATE TABLE `referential_constraints` (
306- `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
307- `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
308- `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
309- `UNIQUE_CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
310- `UNIQUE_CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
311- `UNIQUE_CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
312- `MATCH_OPTION` varchar(256) NOT NULL DEFAULT '',
313- `UPDATE_RULE` varchar(256) NOT NULL DEFAULT '',
314- `DELETE_RULE` varchar(256) NOT NULL DEFAULT ''
315+ `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
316+ `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
317+ `CONSTRAINT_NAME` varchar(256) NOT NULL,
318+ `UNIQUE_CONSTRAINT_CATALOG` varchar(256) NOT NULL,
319+ `UNIQUE_CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
320+ `UNIQUE_CONSTRAINT_NAME` varchar(256) NOT NULL,
321+ `MATCH_OPTION` varchar(256) NOT NULL,
322+ `UPDATE_RULE` varchar(256) NOT NULL,
323+ `DELETE_RULE` varchar(256) NOT NULL
324 ) ENGINE=FunctionEngine
325 SHOW CREATE TABLE `ROUTINES`;
326 Table Create Table
327 ROUTINES CREATE TABLE `routines` (
328- `SPECIFIC_CATALOG` varchar(256) NOT NULL DEFAULT '',
329- `SPECIFIC_SCHEMA` varchar(256) NOT NULL DEFAULT '',
330- `SPECIFIC_NAME` varchar(256) NOT NULL DEFAULT '',
331- `ROUTINE_CATALOG` varchar(256) NOT NULL DEFAULT '',
332- `ROUTINE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
333- `ROUTINE_NAME` varchar(256) NOT NULL DEFAULT '',
334- `MODULE_CATALOG` varchar(256) NOT NULL DEFAULT '',
335- `MODULE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
336- `MODULE_NAME` varchar(256) NOT NULL DEFAULT '',
337- `UDT_CATALOG` varchar(256) NOT NULL DEFAULT '',
338- `UDT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
339- `UDT_NAME` varchar(256) NOT NULL DEFAULT '',
340- `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
341- `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL DEFAULT '',
342- `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
343- `COLLATION_CATALOG` varchar(256) NOT NULL DEFAULT '',
344- `COLLATION_SCHEMA` varchar(256) NOT NULL DEFAULT '',
345- `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
346- `CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
347- `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
348- `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
349- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
350- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
351- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
352- `NUMERIC_PRECISION` varchar(256) NOT NULL DEFAULT '',
353- `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL DEFAULT '',
354- `NUMERIC_SCALE` varchar(256) NOT NULL DEFAULT '',
355- `DATETIME_PRECISION` varchar(256) NOT NULL DEFAULT '',
356- `INTERVAL_TYPE` varchar(256) NOT NULL DEFAULT '',
357- `INTERVAL_PRECISION` varchar(256) NOT NULL DEFAULT '',
358- `TYPE_UDT_CATALOG` varchar(256) NOT NULL DEFAULT '',
359- `TYPE_UDT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
360- `TYPE_UDT_NAME` varchar(256) NOT NULL DEFAULT '',
361- `SCOPE_CATALOG` varchar(256) NOT NULL DEFAULT '',
362- `SCOPE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
363- `SCOPE_NAME` varchar(256) NOT NULL DEFAULT '',
364- `MAXIMUM_CARDINALITY` varchar(256) NOT NULL DEFAULT '',
365- `DTD_IDENTIFIER` varchar(256) NOT NULL DEFAULT '',
366- `ROUTINE_BODY` varchar(256) NOT NULL DEFAULT '',
367- `ROUTINE_DEFINITION` varchar(256) NOT NULL DEFAULT '',
368- `EXTERNAL_NAME` varchar(256) NOT NULL DEFAULT '',
369- `EXTERNAL_LANGUAGE` varchar(256) NOT NULL DEFAULT '',
370- `PARAMETER_STYLE` varchar(256) NOT NULL DEFAULT '',
371- `IS_DETERMINISTIC` varchar(256) NOT NULL DEFAULT '',
372- `SQL_DATA_ACCESS` varchar(256) NOT NULL DEFAULT '',
373- `IS_NULL_CALL` varchar(256) NOT NULL DEFAULT '',
374- `SQL_PATH` varchar(256) NOT NULL DEFAULT '',
375- `SCHEMA_LEVEL_ROUTINE` varchar(256) NOT NULL DEFAULT '',
376- `MAX_DYNAMIC_RESULT_SETS` varchar(256) NOT NULL DEFAULT '',
377- `IS_USER_DEFINED_CAST` varchar(256) NOT NULL DEFAULT '',
378- `IS_IMPLICITLY_INVOCABLE` varchar(256) NOT NULL DEFAULT '',
379- `CREATED` varchar(256) NOT NULL DEFAULT '',
380- `LAST_ALTERED` varchar(256) NOT NULL DEFAULT ''
381+ `SPECIFIC_CATALOG` varchar(256) NOT NULL,
382+ `SPECIFIC_SCHEMA` varchar(256) NOT NULL,
383+ `SPECIFIC_NAME` varchar(256) NOT NULL,
384+ `ROUTINE_CATALOG` varchar(256) NOT NULL,
385+ `ROUTINE_SCHEMA` varchar(256) NOT NULL,
386+ `ROUTINE_NAME` varchar(256) NOT NULL,
387+ `MODULE_CATALOG` varchar(256) NOT NULL,
388+ `MODULE_SCHEMA` varchar(256) NOT NULL,
389+ `MODULE_NAME` varchar(256) NOT NULL,
390+ `UDT_CATALOG` varchar(256) NOT NULL,
391+ `UDT_SCHEMA` varchar(256) NOT NULL,
392+ `UDT_NAME` varchar(256) NOT NULL,
393+ `DATA_TYPE` varchar(256) NOT NULL,
394+ `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL,
395+ `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
396+ `COLLATION_CATALOG` varchar(256) NOT NULL,
397+ `COLLATION_SCHEMA` varchar(256) NOT NULL,
398+ `COLLATION_NAME` varchar(256) NOT NULL,
399+ `CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
400+ `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
401+ `CHARACTER_SET_NAME` varchar(256) NOT NULL,
402+ `TABLE_CATALOG` varchar(256) NOT NULL,
403+ `TABLE_SCHEMA` varchar(256) NOT NULL,
404+ `TABLE_NAME` varchar(256) NOT NULL,
405+ `NUMERIC_PRECISION` varchar(256) NOT NULL,
406+ `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL,
407+ `NUMERIC_SCALE` varchar(256) NOT NULL,
408+ `DATETIME_PRECISION` varchar(256) NOT NULL,
409+ `INTERVAL_TYPE` varchar(256) NOT NULL,
410+ `INTERVAL_PRECISION` varchar(256) NOT NULL,
411+ `TYPE_UDT_CATALOG` varchar(256) NOT NULL,
412+ `TYPE_UDT_SCHEMA` varchar(256) NOT NULL,
413+ `TYPE_UDT_NAME` varchar(256) NOT NULL,
414+ `SCOPE_CATALOG` varchar(256) NOT NULL,
415+ `SCOPE_SCHEMA` varchar(256) NOT NULL,
416+ `SCOPE_NAME` varchar(256) NOT NULL,
417+ `MAXIMUM_CARDINALITY` varchar(256) NOT NULL,
418+ `DTD_IDENTIFIER` varchar(256) NOT NULL,
419+ `ROUTINE_BODY` varchar(256) NOT NULL,
420+ `ROUTINE_DEFINITION` varchar(256) NOT NULL,
421+ `EXTERNAL_NAME` varchar(256) NOT NULL,
422+ `EXTERNAL_LANGUAGE` varchar(256) NOT NULL,
423+ `PARAMETER_STYLE` varchar(256) NOT NULL,
424+ `IS_DETERMINISTIC` varchar(256) NOT NULL,
425+ `SQL_DATA_ACCESS` varchar(256) NOT NULL,
426+ `IS_NULL_CALL` varchar(256) NOT NULL,
427+ `SQL_PATH` varchar(256) NOT NULL,
428+ `SCHEMA_LEVEL_ROUTINE` varchar(256) NOT NULL,
429+ `MAX_DYNAMIC_RESULT_SETS` varchar(256) NOT NULL,
430+ `IS_USER_DEFINED_CAST` varchar(256) NOT NULL,
431+ `IS_IMPLICITLY_INVOCABLE` varchar(256) NOT NULL,
432+ `CREATED` varchar(256) NOT NULL,
433+ `LAST_ALTERED` varchar(256) NOT NULL
434 ) ENGINE=FunctionEngine
435 SHOW CREATE TABLE `ROUTINE_COLUMNS`;
436 Table Create Table
437 ROUTINE_COLUMNS CREATE TABLE `routine_columns` (
438- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
439- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
440- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
441- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
442- `ORDINAL_POSITION` varchar(256) NOT NULL DEFAULT '',
443- `COLUMN_DEFAULT` varchar(256) NOT NULL DEFAULT '',
444- `IS_NULLABLE` varchar(256) NOT NULL DEFAULT '',
445- `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
446- `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL DEFAULT '',
447- `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL DEFAULT '',
448- `NUMERIC_PRECISION` varchar(256) NOT NULL DEFAULT '',
449- `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL DEFAULT '',
450- `NUMERIC_SCALE` varchar(256) NOT NULL DEFAULT '',
451- `DATETIME_PRECISION` varchar(256) NOT NULL DEFAULT '',
452- `CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
453- `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
454- `CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT '',
455- `COLLATION_CATALOG` varchar(256) NOT NULL DEFAULT '',
456- `COLLATION_SCHEMA` varchar(256) NOT NULL DEFAULT '',
457- `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
458- `DOMAIN_CATALOG` varchar(256) NOT NULL DEFAULT '',
459- `DOMAIN_SCHEMA` varchar(256) NOT NULL DEFAULT '',
460- `DOMAIN_NAME` varchar(256) NOT NULL DEFAULT ''
461+ `TABLE_CATALOG` varchar(256) NOT NULL,
462+ `TABLE_SCHEMA` varchar(256) NOT NULL,
463+ `TABLE_NAME` varchar(256) NOT NULL,
464+ `COLUMN_NAME` varchar(256) NOT NULL,
465+ `ORDINAL_POSITION` varchar(256) NOT NULL,
466+ `COLUMN_DEFAULT` varchar(256) NOT NULL,
467+ `IS_NULLABLE` varchar(256) NOT NULL,
468+ `DATA_TYPE` varchar(256) NOT NULL,
469+ `CHARACTER_MAXIMUM_LENGTH` varchar(256) NOT NULL,
470+ `CHARACTER_OCTET_LENGTH` varchar(256) NOT NULL,
471+ `NUMERIC_PRECISION` varchar(256) NOT NULL,
472+ `NUMERIC_PRECISION_RADIX` varchar(256) NOT NULL,
473+ `NUMERIC_SCALE` varchar(256) NOT NULL,
474+ `DATETIME_PRECISION` varchar(256) NOT NULL,
475+ `CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
476+ `CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
477+ `CHARACTER_SET_NAME` varchar(256) NOT NULL,
478+ `COLLATION_CATALOG` varchar(256) NOT NULL,
479+ `COLLATION_SCHEMA` varchar(256) NOT NULL,
480+ `COLLATION_NAME` varchar(256) NOT NULL,
481+ `DOMAIN_CATALOG` varchar(256) NOT NULL,
482+ `DOMAIN_SCHEMA` varchar(256) NOT NULL,
483+ `DOMAIN_NAME` varchar(256) NOT NULL
484 ) ENGINE=FunctionEngine
485 SHOW CREATE TABLE `SCHEMATA`;
486 Table Create Table
487 SCHEMATA CREATE TABLE `schemata` (
488- `CATALOG_NAME` varchar(256) NOT NULL DEFAULT '',
489- `SCHEMA_NAME` varchar(256) NOT NULL DEFAULT '',
490- `SCHEMA_OWNER` varchar(256) NOT NULL DEFAULT '',
491- `DEFAULT_CHARACTER_SET_CATALOG` varchar(256) NOT NULL DEFAULT '',
492- `DEFAULT_CHARACTER_SET_SCHEMA` varchar(256) NOT NULL DEFAULT '',
493- `DEFAULT_CHARACTER_SET_NAME` varchar(256) NOT NULL DEFAULT ''
494+ `CATALOG_NAME` varchar(256) NOT NULL,
495+ `SCHEMA_NAME` varchar(256) NOT NULL,
496+ `SCHEMA_OWNER` varchar(256) NOT NULL,
497+ `DEFAULT_CHARACTER_SET_CATALOG` varchar(256) NOT NULL,
498+ `DEFAULT_CHARACTER_SET_SCHEMA` varchar(256) NOT NULL,
499+ `DEFAULT_CHARACTER_SET_NAME` varchar(256) NOT NULL
500 ) ENGINE=FunctionEngine
501 SHOW CREATE TABLE `TABLES`;
502 Table Create Table
503 TABLES CREATE TABLE `tables` (
504- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
505- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
506- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
507- `TABLE_TYPE` varchar(256) NOT NULL DEFAULT ''
508+ `TABLE_CATALOG` varchar(256) NOT NULL,
509+ `TABLE_SCHEMA` varchar(256) NOT NULL,
510+ `TABLE_NAME` varchar(256) NOT NULL,
511+ `TABLE_TYPE` varchar(256) NOT NULL
512 ) ENGINE=FunctionEngine
513 SHOW CREATE TABLE `TABLE_CONSTRAINTS`;
514 Table Create Table
515 TABLE_CONSTRAINTS CREATE TABLE `table_constraints` (
516- `CONSTRAINT_CATALOG` varchar(256) NOT NULL DEFAULT '',
517- `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
518- `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
519- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
520- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
521- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
522- `CONSTRAINT_TYPE` varchar(256) NOT NULL DEFAULT '',
523- `IS_DEFERRABLE` varchar(5) NOT NULL DEFAULT '',
524- `INITIALLY_DEFERRED` varchar(5) NOT NULL DEFAULT ''
525+ `CONSTRAINT_CATALOG` varchar(256) NOT NULL,
526+ `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
527+ `CONSTRAINT_NAME` varchar(256) NOT NULL,
528+ `TABLE_CATALOG` varchar(256) NOT NULL,
529+ `TABLE_SCHEMA` varchar(256) NOT NULL,
530+ `TABLE_NAME` varchar(256) NOT NULL,
531+ `CONSTRAINT_TYPE` varchar(256) NOT NULL,
532+ `IS_DEFERRABLE` varchar(5) NOT NULL,
533+ `INITIALLY_DEFERRED` varchar(5) NOT NULL
534 ) ENGINE=FunctionEngine
535 SHOW CREATE TABLE `TABLE_PRIVILEGES`;
536 Table Create Table
537 TABLE_PRIVILEGES CREATE TABLE `table_privileges` (
538- `GRANTOR` varchar(256) NOT NULL DEFAULT '',
539- `GRANTEE` varchar(256) NOT NULL DEFAULT '',
540- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
541- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
542- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
543- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
544- `PRIVILEGE_TYPE` varchar(256) NOT NULL DEFAULT '',
545- `IS_GRANTABLE` varchar(256) NOT NULL DEFAULT ''
546+ `GRANTOR` varchar(256) NOT NULL,
547+ `GRANTEE` varchar(256) NOT NULL,
548+ `TABLE_CATALOG` varchar(256) NOT NULL,
549+ `TABLE_SCHEMA` varchar(256) NOT NULL,
550+ `TABLE_NAME` varchar(256) NOT NULL,
551+ `COLUMN_NAME` varchar(256) NOT NULL,
552+ `PRIVILEGE_TYPE` varchar(256) NOT NULL,
553+ `IS_GRANTABLE` varchar(256) NOT NULL
554 ) ENGINE=FunctionEngine
555 SHOW CREATE TABLE `VIEWS`;
556 Table Create Table
557 VIEWS CREATE TABLE `views` (
558- `VIEW_CATALOG` varchar(256) NOT NULL DEFAULT '',
559- `VIEW_SCHEMA` varchar(256) NOT NULL DEFAULT '',
560- `VIEW_NAME` varchar(256) NOT NULL DEFAULT '',
561- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
562- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
563- `TABLE_NAME` varchar(256) NOT NULL DEFAULT ''
564+ `VIEW_CATALOG` varchar(256) NOT NULL,
565+ `VIEW_SCHEMA` varchar(256) NOT NULL,
566+ `VIEW_NAME` varchar(256) NOT NULL,
567+ `TABLE_CATALOG` varchar(256) NOT NULL,
568+ `TABLE_SCHEMA` varchar(256) NOT NULL,
569+ `TABLE_NAME` varchar(256) NOT NULL
570 ) ENGINE=FunctionEngine
571 SHOW CREATE TABLE `VIEW_COLUMN_USAGE`;
572 Table Create Table
573 VIEW_COLUMN_USAGE CREATE TABLE `view_column_usage` (
574- `VIEW_CATALOG` varchar(256) NOT NULL DEFAULT '',
575- `VIEW_SCHEMA` varchar(256) NOT NULL DEFAULT '',
576- `VIEW_NAME` varchar(256) NOT NULL DEFAULT '',
577- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
578- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
579- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
580- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT ''
581+ `VIEW_CATALOG` varchar(256) NOT NULL,
582+ `VIEW_SCHEMA` varchar(256) NOT NULL,
583+ `VIEW_NAME` varchar(256) NOT NULL,
584+ `TABLE_CATALOG` varchar(256) NOT NULL,
585+ `TABLE_SCHEMA` varchar(256) NOT NULL,
586+ `TABLE_NAME` varchar(256) NOT NULL,
587+ `COLUMN_NAME` varchar(256) NOT NULL
588 ) ENGINE=FunctionEngine
589 SHOW CREATE TABLE `VIEW_TABLE_USAGE`;
590 Table Create Table
591 VIEW_TABLE_USAGE CREATE TABLE `view_table_usage` (
592- `TABLE_CATALOG` varchar(256) NOT NULL DEFAULT '',
593- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
594- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
595- `VIEW_DEFINITION` varchar(256) NOT NULL DEFAULT '',
596- `CHECK_OPTION` varchar(256) NOT NULL DEFAULT '',
597- `IS_UPDATABLE` varchar(256) NOT NULL DEFAULT ''
598+ `TABLE_CATALOG` varchar(256) NOT NULL,
599+ `TABLE_SCHEMA` varchar(256) NOT NULL,
600+ `TABLE_NAME` varchar(256) NOT NULL,
601+ `VIEW_DEFINITION` varchar(256) NOT NULL,
602+ `CHECK_OPTION` varchar(256) NOT NULL,
603+ `IS_UPDATABLE` varchar(256) NOT NULL
604 ) ENGINE=FunctionEngine
605
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 show create table INNODB_CMP;
611 Table Create Table
612 INNODB_CMP CREATE TABLE `innodb_cmp` (
613- `PAGE_SIZE` bigint NOT NULL DEFAULT '0',
614- `COMPRESS_OPS` bigint NOT NULL DEFAULT '0',
615- `COMPRESS_OPS_OK` bigint NOT NULL DEFAULT '0',
616- `COMPRESS_TIME` bigint NOT NULL DEFAULT '0',
617- `UNCOMPRESS_OPS` bigint NOT NULL DEFAULT '0',
618- `UNCOMPRESS_TIME` bigint NOT NULL DEFAULT '0'
619+ `PAGE_SIZE` bigint NOT NULL,
620+ `COMPRESS_OPS` bigint NOT NULL,
621+ `COMPRESS_OPS_OK` bigint NOT NULL,
622+ `COMPRESS_TIME` bigint NOT NULL,
623+ `UNCOMPRESS_OPS` bigint NOT NULL,
624+ `UNCOMPRESS_TIME` bigint NOT NULL
625 ) ENGINE=FunctionEngine
626
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 show create table INNODB_CMP_RESET;
632 Table Create Table
633 INNODB_CMP_RESET CREATE TABLE `innodb_cmp_reset` (
634- `PAGE_SIZE` bigint NOT NULL DEFAULT '0',
635- `COMPRESS_OPS` bigint NOT NULL DEFAULT '0',
636- `COMPRESS_OPS_OK` bigint NOT NULL DEFAULT '0',
637- `COMPRESS_TIME` bigint NOT NULL DEFAULT '0',
638- `UNCOMPRESS_OPS` bigint NOT NULL DEFAULT '0',
639- `UNCOMPRESS_TIME` bigint NOT NULL DEFAULT '0'
640+ `PAGE_SIZE` bigint NOT NULL,
641+ `COMPRESS_OPS` bigint NOT NULL,
642+ `COMPRESS_OPS_OK` bigint NOT NULL,
643+ `COMPRESS_TIME` bigint NOT NULL,
644+ `UNCOMPRESS_OPS` bigint NOT NULL,
645+ `UNCOMPRESS_TIME` bigint NOT NULL
646 ) ENGINE=FunctionEngine
647
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 show create table INNODB_CMPMEM;
653 Table Create Table
654 INNODB_CMPMEM CREATE TABLE `innodb_cmpmem` (
655- `PAGE_SIZE` bigint NOT NULL DEFAULT '0',
656- `PAGES_USED` bigint NOT NULL DEFAULT '0',
657- `PAGES_FREE` bigint NOT NULL DEFAULT '0',
658- `RELOCATION_OPS` bigint NOT NULL DEFAULT '0',
659- `RELOCATION_TIME` bigint NOT NULL DEFAULT '0'
660+ `PAGE_SIZE` bigint NOT NULL,
661+ `PAGES_USED` bigint NOT NULL,
662+ `PAGES_FREE` bigint NOT NULL,
663+ `RELOCATION_OPS` bigint NOT NULL,
664+ `RELOCATION_TIME` bigint NOT NULL
665 ) ENGINE=FunctionEngine
666
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 show create table INNODB_CMPMEM_RESET;
672 Table Create Table
673 INNODB_CMPMEM_RESET CREATE TABLE `innodb_cmpmem_reset` (
674- `PAGE_SIZE` bigint NOT NULL DEFAULT '0',
675- `PAGES_USED` bigint NOT NULL DEFAULT '0',
676- `PAGES_FREE` bigint NOT NULL DEFAULT '0',
677- `RELOCATION_OPS` bigint NOT NULL DEFAULT '0',
678- `RELOCATION_TIME` bigint NOT NULL DEFAULT '0'
679+ `PAGE_SIZE` bigint NOT NULL,
680+ `PAGES_USED` bigint NOT NULL,
681+ `PAGES_FREE` bigint NOT NULL,
682+ `RELOCATION_OPS` bigint NOT NULL,
683+ `RELOCATION_TIME` bigint NOT NULL
684 ) ENGINE=FunctionEngine
685
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 show create table INNODB_LOCK_WAITS;
691 Table Create Table
692 INNODB_LOCK_WAITS CREATE TABLE `innodb_lock_waits` (
693- `REQUESTING_TRX_ID` varchar(256) NOT NULL DEFAULT '',
694- `REQUESTED_LOCK_ID` varchar(256) NOT NULL DEFAULT '',
695- `BLOCKING_TRX_ID` varchar(256) NOT NULL DEFAULT '',
696- `BLOCKING_LOCK_ID` varchar(256) NOT NULL DEFAULT ''
697+ `REQUESTING_TRX_ID` varchar(256) NOT NULL,
698+ `REQUESTED_LOCK_ID` varchar(256) NOT NULL,
699+ `BLOCKING_TRX_ID` varchar(256) NOT NULL,
700+ `BLOCKING_LOCK_ID` varchar(256) NOT NULL
701 ) ENGINE=FunctionEngine
702
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 show create table INNODB_LOCKS;
708 Table Create Table
709 INNODB_LOCKS CREATE TABLE `innodb_locks` (
710- `LOCK_ID` varchar(256) NOT NULL DEFAULT '',
711- `LOCK_TRX_ID` varchar(256) NOT NULL DEFAULT '',
712- `LOCK_MODE` varchar(256) NOT NULL DEFAULT '',
713- `LOCK_TYPE` varchar(256) NOT NULL DEFAULT '',
714- `LOCK_TABLE` varchar(256) NOT NULL DEFAULT '',
715- `LOCK_INDEX` varchar(256) NOT NULL DEFAULT '',
716- `LOCK_SPACE` bigint NOT NULL DEFAULT '0',
717- `LOCK_PAGE` bigint NOT NULL DEFAULT '0',
718- `LOCK_REC` bigint NOT NULL DEFAULT '0',
719- `LOCK_DATA` varchar(256) NOT NULL DEFAULT ''
720+ `LOCK_ID` varchar(256) NOT NULL,
721+ `LOCK_TRX_ID` varchar(256) NOT NULL,
722+ `LOCK_MODE` varchar(256) NOT NULL,
723+ `LOCK_TYPE` varchar(256) NOT NULL,
724+ `LOCK_TABLE` varchar(256) NOT NULL,
725+ `LOCK_INDEX` varchar(256) NOT NULL,
726+ `LOCK_SPACE` bigint NOT NULL,
727+ `LOCK_PAGE` bigint NOT NULL,
728+ `LOCK_REC` bigint NOT NULL,
729+ `LOCK_DATA` varchar(256) NOT NULL
730 ) ENGINE=FunctionEngine
731
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 show create table INNODB_STATUS;
737 Table Create Table
738 INNODB_STATUS CREATE TABLE `innodb_status` (
739- `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
740- `VARIABLE_VALUE` varchar(256) NOT NULL DEFAULT ''
741+ `VARIABLE_NAME` varchar(256) NOT NULL,
742+ `VARIABLE_VALUE` varchar(256) NOT NULL
743 ) ENGINE=FunctionEngine
744
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 show create table INNODB_TRX;
750 Table Create Table
751 INNODB_TRX CREATE TABLE `innodb_trx` (
752- `TRX_ID` varchar(256) NOT NULL DEFAULT '',
753- `TRX_STATE` varchar(256) NOT NULL DEFAULT '',
754- `TRX_STARTED` bigint NOT NULL DEFAULT '0',
755- `TRX_REQUESTED_LOCK_ID` varchar(256) NOT NULL DEFAULT '',
756- `TRX_WAIT_STARTED` bigint NOT NULL DEFAULT '0',
757- `TRX_WEIGHT` bigint NOT NULL DEFAULT '0',
758- `TRX_DRIZZLE_THREAD_ID` bigint NOT NULL DEFAULT '0',
759- `TRX_QUERY` varchar(256) NOT NULL DEFAULT ''
760+ `TRX_ID` varchar(256) NOT NULL,
761+ `TRX_STATE` varchar(256) NOT NULL,
762+ `TRX_STARTED` bigint NOT NULL,
763+ `TRX_REQUESTED_LOCK_ID` varchar(256) NOT NULL,
764+ `TRX_WAIT_STARTED` bigint NOT NULL,
765+ `TRX_WEIGHT` bigint NOT NULL,
766+ `TRX_DRIZZLE_THREAD_ID` bigint NOT NULL,
767+ `TRX_QUERY` varchar(256) NOT NULL
768 ) ENGINE=FunctionEngine
769
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 SHOW CREATE TABLE data_dictionary.SESSION_STATEMENTS;
775 Table Create Table
776 SESSION_STATEMENTS CREATE TABLE `session_statements` (
777- `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
778- `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
779+ `VARIABLE_NAME` varchar(256) NOT NULL,
780+ `VARIABLE_VALUE` varchar(1024) NOT NULL
781 ) ENGINE=FunctionEngine
782 SELECT count(*) FROM data_dictionary.SESSION_STATEMENTS;
783 count(*)
784
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 SHOW CREATE TABLE data_dictionary.GLOBAL_STATEMENTS;
790 Table Create Table
791 GLOBAL_STATEMENTS CREATE TABLE `global_statements` (
792- `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
793- `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
794+ `VARIABLE_NAME` varchar(256) NOT NULL,
795+ `VARIABLE_VALUE` varchar(1024) NOT NULL
796 ) ENGINE=FunctionEngine
797 SELECT count(*) FROM data_dictionary.GLOBAL_STATEMENTS;
798 count(*)
799
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 show create table MODULES ;
805 Table Create Table
806 MODULES CREATE TABLE `modules` (
807- `MODULE_NAME` varchar(256) NOT NULL DEFAULT '',
808- `MODULE_VERSION` varchar(20) NOT NULL DEFAULT '',
809- `MODULE_AUTHOR` varchar(256) NOT NULL DEFAULT '',
810- `IS_BUILTIN` varchar(5) NOT NULL DEFAULT '',
811- `MODULE_LIBRARY` varchar(254) NOT NULL DEFAULT '',
812- `MODULE_DESCRIPTION` varchar(254) NOT NULL DEFAULT '',
813- `MODULE_LICENSE` varchar(80) NOT NULL DEFAULT ''
814+ `MODULE_NAME` varchar(256) NOT NULL,
815+ `MODULE_VERSION` varchar(20) NOT NULL,
816+ `MODULE_AUTHOR` varchar(256) NOT NULL,
817+ `IS_BUILTIN` varchar(5) NOT NULL,
818+ `MODULE_LIBRARY` varchar(254) NOT NULL,
819+ `MODULE_DESCRIPTION` varchar(254) NOT NULL,
820+ `MODULE_LICENSE` varchar(80) NOT NULL
821 ) ENGINE=FunctionEngine
822 show create table PLUGINS ;
823 Table Create Table
824 PLUGINS CREATE TABLE `plugins` (
825- `PLUGIN_NAME` varchar(256) NOT NULL DEFAULT '',
826- `PLUGIN_TYPE` varchar(256) NOT NULL DEFAULT '',
827- `IS_ACTIVE` varchar(5) NOT NULL DEFAULT '',
828- `MODULE_NAME` varchar(256) NOT NULL DEFAULT ''
829+ `PLUGIN_NAME` varchar(256) NOT NULL,
830+ `PLUGIN_TYPE` varchar(256) NOT NULL,
831+ `IS_ACTIVE` varchar(5) NOT NULL,
832+ `MODULE_NAME` varchar(256) NOT NULL
833 ) ENGINE=FunctionEngine
834
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 show create table replication_streams;
840 Table Create Table
841 replication_streams CREATE TABLE `replication_streams` (
842- `REPLICATOR` varchar(256) NOT NULL DEFAULT '',
843- `APPLIER` varchar(256) NOT NULL DEFAULT ''
844+ `REPLICATOR` varchar(256) NOT NULL,
845+ `APPLIER` varchar(256) NOT NULL
846 ) ENGINE=FunctionEngine
847
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 show create table COLUMNS ;
853 Table Create Table
854 COLUMNS CREATE TABLE `columns` (
855- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
856- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
857- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
858- `COLUMN_TYPE` varchar(256) NOT NULL DEFAULT '',
859- `ORDINAL_POSITION` bigint NOT NULL DEFAULT '0',
860+ `TABLE_SCHEMA` varchar(256) NOT NULL,
861+ `TABLE_NAME` varchar(256) NOT NULL,
862+ `COLUMN_NAME` varchar(256) NOT NULL,
863+ `COLUMN_TYPE` varchar(256) NOT NULL,
864+ `ORDINAL_POSITION` bigint NOT NULL,
865 `COLUMN_DEFAULT` varbinary(65535) DEFAULT NULL,
866- `COLUMN_DEFAULT_IS_NULL` varchar(5) NOT NULL DEFAULT '',
867- `COLUMN_DEFAULT_UPDATE` varchar(256) NOT NULL DEFAULT '',
868- `IS_NULLABLE` varchar(5) NOT NULL DEFAULT '',
869- `IS_INDEXED` varchar(5) NOT NULL DEFAULT '',
870- `IS_USED_IN_PRIMARY` varchar(5) NOT NULL DEFAULT '',
871- `IS_UNIQUE` varchar(5) NOT NULL DEFAULT '',
872- `IS_MULTI` varchar(5) NOT NULL DEFAULT '',
873- `IS_FIRST_IN_MULTI` varchar(5) NOT NULL DEFAULT '',
874- `INDEXES_FOUND_IN` bigint NOT NULL DEFAULT '0',
875- `DATA_TYPE` varchar(256) NOT NULL DEFAULT '',
876+ `COLUMN_DEFAULT_IS_NULL` varchar(5) NOT NULL,
877+ `COLUMN_DEFAULT_UPDATE` varchar(256) NOT NULL,
878+ `IS_NULLABLE` varchar(5) NOT NULL,
879+ `IS_INDEXED` varchar(5) NOT NULL,
880+ `IS_USED_IN_PRIMARY` varchar(5) NOT NULL,
881+ `IS_UNIQUE` varchar(5) NOT NULL,
882+ `IS_MULTI` varchar(5) NOT NULL,
883+ `IS_FIRST_IN_MULTI` varchar(5) NOT NULL,
884+ `INDEXES_FOUND_IN` bigint NOT NULL,
885+ `DATA_TYPE` varchar(256) NOT NULL,
886 `CHARACTER_MAXIMUM_LENGTH` bigint DEFAULT NULL,
887 `CHARACTER_OCTET_LENGTH` bigint DEFAULT NULL,
888 `NUMERIC_PRECISION` bigint DEFAULT NULL,
889 `NUMERIC_SCALE` bigint DEFAULT NULL,
890- `COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
891+ `COLLATION_NAME` varchar(256) NOT NULL,
892 `COLUMN_COMMENT` varchar(1024) DEFAULT NULL
893 ) ENGINE=FunctionEngine
894 show create table INDEXES ;
895 Table Create Table
896 INDEXES CREATE TABLE `indexes` (
897- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
898- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
899- `INDEX_NAME` varchar(256) NOT NULL DEFAULT '',
900- `IS_USED_IN_PRIMARY` varchar(5) NOT NULL DEFAULT '',
901- `IS_UNIQUE` varchar(5) NOT NULL DEFAULT '',
902- `IS_NULLABLE` varchar(5) NOT NULL DEFAULT '',
903- `KEY_LENGTH` bigint NOT NULL DEFAULT '0',
904- `INDEX_TYPE` varchar(256) NOT NULL DEFAULT '',
905+ `TABLE_SCHEMA` varchar(256) NOT NULL,
906+ `TABLE_NAME` varchar(256) NOT NULL,
907+ `INDEX_NAME` varchar(256) NOT NULL,
908+ `IS_USED_IN_PRIMARY` varchar(5) NOT NULL,
909+ `IS_UNIQUE` varchar(5) NOT NULL,
910+ `IS_NULLABLE` varchar(5) NOT NULL,
911+ `KEY_LENGTH` bigint NOT NULL,
912+ `INDEX_TYPE` varchar(256) NOT NULL,
913 `INDEX_COMMENT` varchar(1024) DEFAULT NULL
914 ) ENGINE=FunctionEngine
915 show create table INDEX_PARTS ;
916 Table Create Table
917 INDEX_PARTS CREATE TABLE `index_parts` (
918- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
919- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
920- `INDEX_NAME` varchar(256) NOT NULL DEFAULT '',
921- `COLUMN_NAME` varchar(256) NOT NULL DEFAULT '',
922- `COLUMN_NUMBER` bigint NOT NULL DEFAULT '0',
923- `SEQUENCE_IN_INDEX` bigint NOT NULL DEFAULT '0',
924- `COMPARE_LENGTH` bigint NOT NULL DEFAULT '0',
925- `IS_ORDER_REVERSE` varchar(5) NOT NULL DEFAULT '',
926- `IS_USED_IN_PRIMARY` varchar(5) NOT NULL DEFAULT '',
927- `IS_UNIQUE` varchar(5) NOT NULL DEFAULT '',
928- `IS_NULLABLE` varchar(5) NOT NULL DEFAULT ''
929+ `TABLE_SCHEMA` varchar(256) NOT NULL,
930+ `TABLE_NAME` varchar(256) NOT NULL,
931+ `INDEX_NAME` varchar(256) NOT NULL,
932+ `COLUMN_NAME` varchar(256) NOT NULL,
933+ `COLUMN_NUMBER` bigint NOT NULL,
934+ `SEQUENCE_IN_INDEX` bigint NOT NULL,
935+ `COMPARE_LENGTH` bigint NOT NULL,
936+ `IS_ORDER_REVERSE` varchar(5) NOT NULL,
937+ `IS_USED_IN_PRIMARY` varchar(5) NOT NULL,
938+ `IS_UNIQUE` varchar(5) NOT NULL,
939+ `IS_NULLABLE` varchar(5) NOT NULL
940 ) ENGINE=FunctionEngine
941 show create table REFERENTIAL_CONSTRAINTS ;
942 Table Create Table
943 REFERENTIAL_CONSTRAINTS CREATE TABLE `referential_constraints` (
944- `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
945- `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
946- `UNIQUE_CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
947- `UNIQUE_CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
948- `MATCH_OPTION` varchar(256) NOT NULL DEFAULT '',
949- `UPDATE_RULE` varchar(256) NOT NULL DEFAULT '',
950- `DELETE_RULE` varchar(256) NOT NULL DEFAULT '',
951- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
952- `REFERENCED_TABLE_NAME` varchar(256) NOT NULL DEFAULT ''
953+ `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
954+ `CONSTRAINT_NAME` varchar(256) NOT NULL,
955+ `UNIQUE_CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
956+ `UNIQUE_CONSTRAINT_NAME` varchar(256) NOT NULL,
957+ `MATCH_OPTION` varchar(256) NOT NULL,
958+ `UPDATE_RULE` varchar(256) NOT NULL,
959+ `DELETE_RULE` varchar(256) NOT NULL,
960+ `TABLE_NAME` varchar(256) NOT NULL,
961+ `REFERENCED_TABLE_NAME` varchar(256) NOT NULL
962 ) ENGINE=FunctionEngine
963 show create table SCHEMAS ;
964 Table Create Table
965 SCHEMAS CREATE TABLE `schemas` (
966- `SCHEMA_NAME` varchar(256) NOT NULL DEFAULT '',
967- `DEFAULT_COLLATION_NAME` varchar(256) NOT NULL DEFAULT '',
968- `SCHEMA_CREATION_TIME` varchar(256) NOT NULL DEFAULT '',
969- `SCHEMA_UPDATE_TIME` varchar(256) NOT NULL DEFAULT ''
970+ `SCHEMA_NAME` varchar(256) NOT NULL,
971+ `DEFAULT_COLLATION_NAME` varchar(256) NOT NULL,
972+ `SCHEMA_CREATION_TIME` varchar(256) NOT NULL,
973+ `SCHEMA_UPDATE_TIME` varchar(256) NOT NULL
974 ) ENGINE=FunctionEngine
975 show create table TABLES ;
976 Table Create Table
977 TABLES CREATE TABLE `tables` (
978- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
979- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
980- `TABLE_TYPE` varchar(256) NOT NULL DEFAULT '',
981- `ENGINE` varchar(256) NOT NULL DEFAULT '',
982- `ROW_FORMAT` varchar(10) NOT NULL DEFAULT '',
983- `TABLE_COLLATION` varchar(256) NOT NULL DEFAULT '',
984- `TABLE_CREATION_TIME` varchar(256) NOT NULL DEFAULT '',
985- `TABLE_UPDATE_TIME` varchar(256) NOT NULL DEFAULT '',
986+ `TABLE_SCHEMA` varchar(256) NOT NULL,
987+ `TABLE_NAME` varchar(256) NOT NULL,
988+ `TABLE_TYPE` varchar(256) NOT NULL,
989+ `ENGINE` varchar(256) NOT NULL,
990+ `ROW_FORMAT` varchar(10) NOT NULL,
991+ `TABLE_COLLATION` varchar(256) NOT NULL,
992+ `TABLE_CREATION_TIME` varchar(256) NOT NULL,
993+ `TABLE_UPDATE_TIME` varchar(256) NOT NULL,
994 `TABLE_COMMENT` varchar(2048) DEFAULT NULL
995 ) ENGINE=FunctionEngine
996 show create table TABLE_CONSTRAINTS ;
997 Table Create Table
998 TABLE_CONSTRAINTS CREATE TABLE `table_constraints` (
999- `CONSTRAINT_SCHEMA` varchar(256) NOT NULL DEFAULT '',
1000- `CONSTRAINT_NAME` varchar(256) NOT NULL DEFAULT '',
1001- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
1002- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
1003- `CONSTRAINT_TYPE` varchar(256) NOT NULL DEFAULT ''
1004+ `CONSTRAINT_SCHEMA` varchar(256) NOT NULL,
1005+ `CONSTRAINT_NAME` varchar(256) NOT NULL,
1006+ `TABLE_SCHEMA` varchar(256) NOT NULL,
1007+ `TABLE_NAME` varchar(256) NOT NULL,
1008+ `CONSTRAINT_TYPE` varchar(256) NOT NULL
1009 ) ENGINE=FunctionEngine
1010 CREATE SCHEMA A;
1011 use A;
1012
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 show create table PROCESSLIST ;
1018 Table Create Table
1019 PROCESSLIST CREATE TABLE `processlist` (
1020- `ID` bigint NOT NULL DEFAULT '0',
1021- `USER` varchar(16) NOT NULL DEFAULT '',
1022- `HOST` varchar(1025) NOT NULL DEFAULT '',
1023- `DB` varchar(256) NOT NULL DEFAULT '',
1024- `COMMAND` varchar(16) NOT NULL DEFAULT '',
1025- `TIME` bigint NOT NULL DEFAULT '0',
1026- `STATE` varchar(256) NOT NULL DEFAULT '',
1027- `INFO` varchar(100) NOT NULL DEFAULT ''
1028+ `ID` bigint NOT NULL,
1029+ `USER` varchar(16) NOT NULL,
1030+ `HOST` varchar(1025) NOT NULL,
1031+ `DB` varchar(256) NOT NULL,
1032+ `COMMAND` varchar(16) NOT NULL,
1033+ `TIME` bigint NOT NULL,
1034+ `STATE` varchar(256) NOT NULL,
1035+ `INFO` varchar(100) NOT NULL
1036 ) ENGINE=FunctionEngine
1037 SELECT ID FROM processlist;
1038 ID
1039
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 show create table GLOBAL_STATUS ;
1045 Table Create Table
1046 GLOBAL_STATUS CREATE TABLE `global_status` (
1047- `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
1048- `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
1049+ `VARIABLE_NAME` varchar(256) NOT NULL,
1050+ `VARIABLE_VALUE` varchar(1024) NOT NULL
1051 ) ENGINE=FunctionEngine
1052 show create table GLOBAL_VARIABLES ;
1053 Table Create Table
1054 GLOBAL_VARIABLES CREATE TABLE `global_variables` (
1055- `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
1056- `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
1057+ `VARIABLE_NAME` varchar(256) NOT NULL,
1058+ `VARIABLE_VALUE` varchar(1024) NOT NULL
1059 ) ENGINE=FunctionEngine
1060 show create table SESSION_STATUS;
1061 Table Create Table
1062 SESSION_STATUS CREATE TABLE `session_status` (
1063- `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
1064- `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
1065+ `VARIABLE_NAME` varchar(256) NOT NULL,
1066+ `VARIABLE_VALUE` varchar(1024) NOT NULL
1067 ) ENGINE=FunctionEngine
1068 show create table SESSION_VARIABLES;
1069 Table Create Table
1070 SESSION_VARIABLES CREATE TABLE `session_variables` (
1071- `VARIABLE_NAME` varchar(256) NOT NULL DEFAULT '',
1072- `VARIABLE_VALUE` varchar(1024) NOT NULL DEFAULT ''
1073+ `VARIABLE_NAME` varchar(256) NOT NULL,
1074+ `VARIABLE_VALUE` varchar(1024) NOT NULL
1075 ) ENGINE=FunctionEngine
1076 SELECT count(*) FROM data_dictionary.GLOBAL_STATUS;
1077 count(*)
1078
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 show create table data_dictionary.TABLE_CACHE;
1084 Table Create Table
1085 TABLE_CACHE CREATE TABLE `table_cache` (
1086- `SESSION_ID` bigint NOT NULL DEFAULT '0',
1087- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
1088- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
1089- `VERSION` bigint NOT NULL DEFAULT '0',
1090- `IS_NAME_LOCKED` varchar(5) NOT NULL DEFAULT '',
1091- `ROWS` bigint NOT NULL DEFAULT '0',
1092- `AVG_ROW_LENGTH` bigint NOT NULL DEFAULT '0',
1093- `TABLE_SIZE` bigint NOT NULL DEFAULT '0',
1094- `AUTO_INCREMENT` bigint NOT NULL DEFAULT '0'
1095+ `SESSION_ID` bigint NOT NULL,
1096+ `TABLE_SCHEMA` varchar(256) NOT NULL,
1097+ `TABLE_NAME` varchar(256) NOT NULL,
1098+ `VERSION` bigint NOT NULL,
1099+ `IS_NAME_LOCKED` varchar(5) NOT NULL,
1100+ `ROWS` bigint NOT NULL,
1101+ `AVG_ROW_LENGTH` bigint NOT NULL,
1102+ `TABLE_SIZE` bigint NOT NULL,
1103+ `AUTO_INCREMENT` bigint NOT NULL
1104 ) ENGINE=FunctionEngine
1105 select count(*) FROM data_dictionary.TABLE_CACHE;
1106 count(*)
1107
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 show create table data_dictionary.TABLE_DEFINITION_CACHE;
1113 Table Create Table
1114 TABLE_DEFINITION_CACHE CREATE TABLE `table_definition_cache` (
1115- `TABLE_SCHEMA` varchar(256) NOT NULL DEFAULT '',
1116- `TABLE_NAME` varchar(256) NOT NULL DEFAULT '',
1117- `VERSION` bigint NOT NULL DEFAULT '0',
1118- `TABLE_COUNT` bigint NOT NULL DEFAULT '0',
1119- `IS_NAME_LOCKED` varchar(5) NOT NULL DEFAULT ''
1120+ `TABLE_SCHEMA` varchar(256) NOT NULL,
1121+ `TABLE_NAME` varchar(256) NOT NULL,
1122+ `VERSION` bigint NOT NULL,
1123+ `TABLE_COUNT` bigint NOT NULL,
1124+ `IS_NAME_LOCKED` varchar(5) NOT NULL
1125 ) ENGINE=FunctionEngine
1126 select count(*) FROM data_dictionary.TABLE_DEFINITION_CACHE;
1127 count(*)
1128
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 show create table t1;
1134 Table Create Table
1135 t1 CREATE TABLE `t1` (
1136- `ID` bigint NOT NULL DEFAULT '0',
1137- `USER` varchar(16) NOT NULL DEFAULT '',
1138- `HOST` varchar(1025) NOT NULL DEFAULT '',
1139- `DB` varchar(256) NOT NULL DEFAULT '',
1140- `COMMAND` varchar(16) NOT NULL DEFAULT '',
1141- `TIME` bigint NOT NULL DEFAULT '0',
1142- `STATE` varchar(256) NOT NULL DEFAULT '',
1143- `INFO` varchar(100) NOT NULL DEFAULT ''
1144+ `ID` bigint NOT NULL,
1145+ `USER` varchar(16) NOT NULL,
1146+ `HOST` varchar(1025) NOT NULL,
1147+ `DB` varchar(256) NOT NULL,
1148+ `COMMAND` varchar(16) NOT NULL,
1149+ `TIME` bigint NOT NULL,
1150+ `STATE` varchar(256) NOT NULL,
1151+ `INFO` varchar(100) NOT NULL
1152 ) ENGINE=InnoDB
1153 drop table t1;
1154 create temporary table t1 like data_dictionary.processlist;
1155@@ -1465,14 +1465,14 @@
1156 show create table t1;
1157 Table Create Table
1158 t1 CREATE TEMPORARY TABLE `t1` (
1159- `ID` bigint NOT NULL DEFAULT '0',
1160- `USER` varchar(16) NOT NULL DEFAULT '',
1161- `HOST` varchar(1025) NOT NULL DEFAULT '',
1162- `DB` varchar(256) NOT NULL DEFAULT '',
1163- `COMMAND` varchar(16) NOT NULL DEFAULT '',
1164- `TIME` bigint NOT NULL DEFAULT '0',
1165- `STATE` varchar(256) NOT NULL DEFAULT '',
1166- `INFO` varchar(100) NOT NULL DEFAULT ''
1167+ `ID` bigint NOT NULL,
1168+ `USER` varchar(16) NOT NULL,
1169+ `HOST` varchar(1025) NOT NULL,
1170+ `DB` varchar(256) NOT NULL,
1171+ `COMMAND` varchar(16) NOT NULL,
1172+ `TIME` bigint NOT NULL,
1173+ `STATE` varchar(256) NOT NULL,
1174+ `INFO` varchar(100) NOT NULL
1175 ) ENGINE=MyISAM
1176 drop table t1;
1177
1178
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 test.t1 check status OK
1184 show index from t1;
1185 Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
1186-def data_dictionary show_indexes SHOW_INDEXES Table Table 8 1024 2 N 1 0 45
1187-def data_dictionary show_indexes SHOW_INDEXES Unique Unique 8 20 3 N 1 0 45
1188-def data_dictionary show_indexes SHOW_INDEXES Key_name Key_name 8 1024 7 N 1 0 45
1189-def data_dictionary show_indexes SHOW_INDEXES Seq_in_index Seq_in_index 5 20 1 N 32769 0 63
1190-def data_dictionary show_indexes SHOW_INDEXES Column_name Column_name 8 1024 1 N 1 0 45
1191+def data_dictionary show_indexes SHOW_INDEXES Table Table 8 1024 2 N 4097 0 45
1192+def data_dictionary show_indexes SHOW_INDEXES Unique Unique 8 20 3 N 4097 0 45
1193+def data_dictionary show_indexes SHOW_INDEXES Key_name Key_name 8 1024 7 N 4097 0 45
1194+def data_dictionary show_indexes SHOW_INDEXES Seq_in_index Seq_in_index 5 20 1 N 36865 0 63
1195+def data_dictionary show_indexes SHOW_INDEXES Column_name Column_name 8 1024 1 N 4097 0 45
1196 Table Unique Key_name Seq_in_index Column_name
1197 t1 YES PRIMARY 1 a
1198 t1 NO b 1 b
1199@@ -48,37 +48,37 @@
1200 -- after Bug#29394 is implemented.
1201 show variables like "server_id%";
1202 Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
1203-def data_dictionary session_variables SESSION_VARIABLES VARIABLE_NAME Variable_name 8 1024 9 N 1 0 45
1204-def data_dictionary session_variables SESSION_VARIABLES VARIABLE_VALUE Value 8 4096 1 N 1 0 45
1205+def data_dictionary session_variables SESSION_VARIABLES VARIABLE_NAME Variable_name 8 1024 9 N 4097 0 45
1206+def data_dictionary session_variables SESSION_VARIABLES VARIABLE_VALUE Value 8 4096 1 N 4097 0 45
1207 Variable_name Value
1208 server_id 1
1209 show variables like "SERVER_id%";
1210 Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
1211-def data_dictionary session_variables SESSION_VARIABLES VARIABLE_NAME Variable_name 8 1024 9 N 1 0 45
1212-def data_dictionary session_variables SESSION_VARIABLES VARIABLE_VALUE Value 8 4096 1 N 1 0 45
1213+def data_dictionary session_variables SESSION_VARIABLES VARIABLE_NAME Variable_name 8 1024 9 N 4097 0 45
1214+def data_dictionary session_variables SESSION_VARIABLES VARIABLE_VALUE Value 8 4096 1 N 4097 0 45
1215 Variable_name Value
1216 server_id 1
1217 show variables like "this_doesn't_exists%";
1218 Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
1219-def data_dictionary session_variables SESSION_VARIABLES VARIABLE_NAME Variable_name 8 1024 0 N 1 0 45
1220-def data_dictionary session_variables SESSION_VARIABLES VARIABLE_VALUE Value 8 4096 0 N 1 0 45
1221+def data_dictionary session_variables SESSION_VARIABLES VARIABLE_NAME Variable_name 8 1024 0 N 4097 0 45
1222+def data_dictionary session_variables SESSION_VARIABLES VARIABLE_VALUE Value 8 4096 0 N 4097 0 45
1223 Variable_name Value
1224 show table status from test like "this_doesn't_exists%";
1225 Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
1226-def data_dictionary show_table_status SHOW_TABLE_STATUS Session Session 5 20 0 N 32769 0 63
1227-def data_dictionary show_table_status SHOW_TABLE_STATUS Schema Schema 8 1024 0 N 1 0 45
1228-def data_dictionary show_table_status SHOW_TABLE_STATUS Name Name 8 1024 0 N 1 0 45
1229-def data_dictionary show_table_status SHOW_TABLE_STATUS Type Type 8 1024 0 N 1 0 45
1230-def data_dictionary show_table_status SHOW_TABLE_STATUS Engine Engine 8 1024 0 N 1 0 45
1231-def data_dictionary show_table_status SHOW_TABLE_STATUS Version Version 8 1024 0 N 1 0 45
1232-def data_dictionary show_table_status SHOW_TABLE_STATUS Rows Rows 8 1024 0 N 1 0 45
1233-def data_dictionary show_table_status SHOW_TABLE_STATUS Avg_row_length Avg_row_length 8 1024 0 N 1 0 45
1234-def data_dictionary show_table_status SHOW_TABLE_STATUS Table_size Table_size 8 1024 0 N 1 0 45
1235-def data_dictionary show_table_status SHOW_TABLE_STATUS Auto_increment Auto_increment 8 1024 0 N 1 0 45
1236+def data_dictionary show_table_status SHOW_TABLE_STATUS Session Session 5 20 0 N 36865 0 63
1237+def data_dictionary show_table_status SHOW_TABLE_STATUS Schema Schema 8 1024 0 N 4097 0 45
1238+def data_dictionary show_table_status SHOW_TABLE_STATUS Name Name 8 1024 0 N 4097 0 45
1239+def data_dictionary show_table_status SHOW_TABLE_STATUS Type Type 8 1024 0 N 4097 0 45
1240+def data_dictionary show_table_status SHOW_TABLE_STATUS Engine Engine 8 1024 0 N 4097 0 45
1241+def data_dictionary show_table_status SHOW_TABLE_STATUS Version Version 8 1024 0 N 4097 0 45
1242+def data_dictionary show_table_status SHOW_TABLE_STATUS Rows Rows 8 1024 0 N 4097 0 45
1243+def data_dictionary show_table_status SHOW_TABLE_STATUS Avg_row_length Avg_row_length 8 1024 0 N 4097 0 45
1244+def data_dictionary show_table_status SHOW_TABLE_STATUS Table_size Table_size 8 1024 0 N 4097 0 45
1245+def data_dictionary show_table_status SHOW_TABLE_STATUS Auto_increment Auto_increment 8 1024 0 N 4097 0 45
1246 Session Schema Name Type Engine Version Rows Avg_row_length Table_size Auto_increment
1247 show databases;
1248 Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
1249-def data_dictionary show_schemas SHOW_SCHEMAS SCHEMA_NAME Database 8 1024 18 N 1 0 45
1250+def data_dictionary show_schemas SHOW_SCHEMAS SCHEMA_NAME Database 8 1024 18 N 4097 0 45
1251 Database
1252 DATA_DICTIONARY
1253 INFORMATION_SCHEMA
1254@@ -86,7 +86,7 @@
1255 test
1256 show databases like "test%";
1257 Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
1258-def data_dictionary show_schemas SHOW_SCHEMAS SCHEMA_NAME Database (test%) 8 1024 4 N 1 0 45
1259+def data_dictionary show_schemas SHOW_SCHEMAS SCHEMA_NAME Database (test%) 8 1024 4 N 4097 0 45
1260 Database (test%)
1261 test
1262 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 );
1265 show index from t1;
1266 Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
1267-def data_dictionary show_indexes SHOW_INDEXES Table Table 8 1024 2 N 1 0 45
1268-def data_dictionary show_indexes SHOW_INDEXES Unique Unique 8 20 3 N 1 0 45
1269-def data_dictionary show_indexes SHOW_INDEXES Key_name Key_name 8 1024 7 N 1 0 45
1270-def data_dictionary show_indexes SHOW_INDEXES Seq_in_index Seq_in_index 5 20 1 N 32769 0 63
1271-def data_dictionary show_indexes SHOW_INDEXES Column_name Column_name 8 1024 6 N 1 0 45
1272+def data_dictionary show_indexes SHOW_INDEXES Table Table 8 1024 2 N 4097 0 45
1273+def data_dictionary show_indexes SHOW_INDEXES Unique Unique 8 20 3 N 4097 0 45
1274+def data_dictionary show_indexes SHOW_INDEXES Key_name Key_name 8 1024 7 N 4097 0 45
1275+def data_dictionary show_indexes SHOW_INDEXES Seq_in_index Seq_in_index 5 20 1 N 36865 0 63
1276+def data_dictionary show_indexes SHOW_INDEXES Column_name Column_name 8 1024 6 N 4097 0 45
1277 Table Unique Key_name Seq_in_index Column_name
1278 t1 YES PRIMARY 1 field1
1279 drop table t1;