Drizzle

Merge lp:~linuxjedi/drizzle/drizzle-drizzledump-mysql-bugs into lp:~drizzle-trunk/drizzle/development

  1. drizzle-drizzledump-mysql-bugs
  2. Merge into development
Proposed by Andrew Hutchings
Status: Merged
Approved by: Brian Aker
Approved revision: 1788
Merged at revision: 1785
Proposed branch: lp:~linuxjedi/drizzle/drizzle-drizzledump-mysql-bugs
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 279 lines (+52/-18)
8 files modified
client/drizzledump.cc (+4/-7)
plugin/schema_dictionary/columns.cc (+27/-0)
plugin/schema_dictionary/tests/r/data_dictionary.result (+11/-1)
tests/r/data_dictionary_like_info.result (+5/-5)
tests/r/information_schema.result (+2/-2)
tests/r/randgen_queries.result (+1/-1)
tests/t/drizzledump.test (+1/-1)
tests/t/drizzledump_restore.test (+1/-1)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/drizzle-drizzledump-mysql-bugs
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+36194@code.launchpad.net

Description of the change

Show stoppers for the new drizzledump:

1. data_dictionary.columns did not show auto_increment
2. data_dictionary.columns did not show possible enum values
Also (not a show-stopper):
3. get rid of --hex-blob (aka. corrupt my data by default) and implicitly turn it on

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'client/drizzledump.cc'
--- client/drizzledump.cc 2010-09-16 01:41:35 +0000
+++ client/drizzledump.cc 2010-09-21 18:57:45 +0000
@@ -106,7 +106,6 @@
106static bool opt_single_transaction= false; 106static bool opt_single_transaction= false;
107static bool opt_comments;107static bool opt_comments;
108static bool opt_compact;108static bool opt_compact;
109static bool opt_hex_blob= false;
110static bool opt_order_by_primary=false; 109static bool opt_order_by_primary=false;
111static bool opt_ignore= false;110static bool opt_ignore= false;
112static bool opt_complete_insert= false;111static bool opt_complete_insert= false;
@@ -1568,7 +1567,7 @@
1568 we have not a BLOB but a TEXT column.1567 we have not a BLOB but a TEXT column.
1569 we'll dump in hex only BLOB columns.1568 we'll dump in hex only BLOB columns.
1570 */1569 */
1571 is_blob= (opt_hex_blob && drizzle_column_charset(column) == 63 &&1570 is_blob= (drizzle_column_charset(column) == 63 &&
1572 (drizzle_column_type(column) == DRIZZLE_COLUMN_TYPE_VARCHAR ||1571 (drizzle_column_type(column) == DRIZZLE_COLUMN_TYPE_VARCHAR ||
1573 drizzle_column_type(column) == DRIZZLE_COLUMN_TYPE_BLOB)) ? 1 : 0;1572 drizzle_column_type(column) == DRIZZLE_COLUMN_TYPE_BLOB)) ? 1 : 0;
1574 if (extended_insert && !opt_xml)1573 if (extended_insert && !opt_xml)
@@ -1597,7 +1596,7 @@
1597 */1596 */
1598 char * tmp_str= (char *)malloc(length * 2 + 2 + 1);1597 char * tmp_str= (char *)malloc(length * 2 + 2 + 1);
1599 memset(tmp_str, '\0', length * 2 + 2 + 1);1598 memset(tmp_str, '\0', length * 2 + 2 + 1);
1600 if (opt_hex_blob && is_blob)1599 if (is_blob)
1601 {1600 {
1602 extended_row.append("0x");1601 extended_row.append("0x");
1603 drizzle_hex_string(tmp_str, row[i], length);1602 drizzle_hex_string(tmp_str, row[i], length);
@@ -1644,7 +1643,7 @@
1644 {1643 {
1645 if (opt_xml)1644 if (opt_xml)
1646 {1645 {
1647 if (opt_hex_blob && is_blob && length)1646 if (is_blob && length)
1648 {1647 {
1649 /* Define xsi:type="xs:hexBinary" for hex encoded data */1648 /* Define xsi:type="xs:hexBinary" for hex encoded data */
1650 print_xml_tag(md_result_file, "\t\t", "", "field", "name=",1649 print_xml_tag(md_result_file, "\t\t", "", "field", "name=",
@@ -1659,7 +1658,7 @@
1659 }1658 }
1660 fputs("</field>\n", md_result_file);1659 fputs("</field>\n", md_result_file);
1661 }1660 }
1662 else if (opt_hex_blob && is_blob && length)1661 else if (is_blob && length)
1663 {1662 {
1664 fputs("0x", md_result_file);1663 fputs("0x", md_result_file);
1665 print_blob_as_hex(md_result_file, row[i], length);1664 print_blob_as_hex(md_result_file, row[i], length);
@@ -2453,8 +2452,6 @@
2453 N_("Fields in the i.file are opt. enclosed by ..."))2452 N_("Fields in the i.file are opt. enclosed by ..."))
2454 ("fields-escaped-by", po::value<string>(&escaped)->default_value(""),2453 ("fields-escaped-by", po::value<string>(&escaped)->default_value(""),
2455 N_("Fields in the i.file are escaped by ..."))2454 N_("Fields in the i.file are escaped by ..."))
2456 ("hex-blob", po::value<bool>(&opt_hex_blob)->default_value(false)->zero_tokens(),
2457 "Dump binary strings (BINARY, VARBINARY, BLOB) in hexadecimal format.")
2458 ("ignore-table", po::value<string>(),2455 ("ignore-table", po::value<string>(),
2459 N_("Do not dump the specified table. To specify more than one table to ignore, use the directive multiple times, once for each table. Each table must be specified with both database and table names, e.g. --ignore-table=database.table"))2456 N_("Do not dump the specified table. To specify more than one table to ignore, use the directive multiple times, once for each table. Each table must be specified with both database and table names, e.g. --ignore-table=database.table"))
2460 ("insert-ignore", po::value<bool>(&opt_ignore)->default_value(false)->zero_tokens(),2457 ("insert-ignore", po::value<bool>(&opt_ignore)->default_value(false)->zero_tokens(),
24612458
=== modified file 'plugin/schema_dictionary/columns.cc'
--- plugin/schema_dictionary/columns.cc 2010-07-30 19:21:23 +0000
+++ plugin/schema_dictionary/columns.cc 2010-09-21 18:57:45 +0000
@@ -37,6 +37,7 @@
37 add_field("COLUMN_DEFAULT", plugin::TableFunction::VARBINARY, 65535, true);37 add_field("COLUMN_DEFAULT", plugin::TableFunction::VARBINARY, 65535, true);
38 add_field("COLUMN_DEFAULT_IS_NULL", plugin::TableFunction::BOOLEAN, 0, false);38 add_field("COLUMN_DEFAULT_IS_NULL", plugin::TableFunction::BOOLEAN, 0, false);
39 add_field("COLUMN_DEFAULT_UPDATE");39 add_field("COLUMN_DEFAULT_UPDATE");
40 add_field("IS_AUTO_INCREMENT", plugin::TableFunction::BOOLEAN, 0, false);
40 add_field("IS_NULLABLE", plugin::TableFunction::BOOLEAN, 0, false);41 add_field("IS_NULLABLE", plugin::TableFunction::BOOLEAN, 0, false);
41 add_field("IS_INDEXED", plugin::TableFunction::BOOLEAN, 0, false);42 add_field("IS_INDEXED", plugin::TableFunction::BOOLEAN, 0, false);
42 add_field("IS_USED_IN_PRIMARY", plugin::TableFunction::BOOLEAN, 0, false);43 add_field("IS_USED_IN_PRIMARY", plugin::TableFunction::BOOLEAN, 0, false);
@@ -51,6 +52,8 @@
51 add_field("NUMERIC_PRECISION", plugin::TableFunction::NUMBER);52 add_field("NUMERIC_PRECISION", plugin::TableFunction::NUMBER);
52 add_field("NUMERIC_SCALE", plugin::TableFunction::NUMBER);53 add_field("NUMERIC_SCALE", plugin::TableFunction::NUMBER);
5354
55 add_field("ENUM_VALUES", plugin::TableFunction::STRING, 1024, true);
56
54 add_field("COLLATION_NAME");57 add_field("COLLATION_NAME");
5558
56 add_field("COLUMN_COMMENT", plugin::TableFunction::STRING, 1024, true);59 add_field("COLUMN_COMMENT", plugin::TableFunction::STRING, 1024, true);
@@ -155,6 +158,9 @@
155 /* COLUMN_DEFAULT_UPDATE */158 /* COLUMN_DEFAULT_UPDATE */
156 push(column.options().update_expression());159 push(column.options().update_expression());
157160
161 /* IS_AUTO_INCREMENT */
162 push(column.numeric_options().is_autoincrement());
163
158 /* IS_NULLABLE */164 /* IS_NULLABLE */
159 push(column.constraints().is_nullable());165 push(column.constraints().is_nullable());
160166
@@ -219,6 +225,27 @@
219 /* "NUMERIC_SCALE" */225 /* "NUMERIC_SCALE" */
220 push(static_cast<int64_t>(column.numeric_options().scale()));226 push(static_cast<int64_t>(column.numeric_options().scale()));
221227
228 /* "ENUM_VALUES" */
229 if (column.type() == drizzled::message::Table::Field::ENUM)
230 {
231 string destination;
232 size_t num_field_values= column.enumeration_values().field_value_size();
233 for (size_t x= 0; x < num_field_values; ++x)
234 {
235 const string &type= column.enumeration_values().field_value(x);
236
237 if (x != 0)
238 destination.push_back(',');
239
240 destination.push_back('\'');
241 destination.append(type);
242 destination.push_back('\'');
243 }
244 push(destination);
245 }
246 else
247 push();
248
222 /* "COLLATION_NAME" */249 /* "COLLATION_NAME" */
223 push(column.string_options().collation());250 push(column.string_options().collation());
224251
225252
=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
--- plugin/schema_dictionary/tests/r/data_dictionary.result 2010-09-10 16:41:50 +0000
+++ plugin/schema_dictionary/tests/r/data_dictionary.result 2010-09-21 18:57:45 +0000
@@ -1,7 +1,7 @@
1use data_dictionary;1use data_dictionary;
2SELECT count(*) FROM columns;2SELECT count(*) FROM columns;
3count(*)3count(*)
44974499
5SELECT count(*) FROM indexes;5SELECT count(*) FROM indexes;
6count(*)6count(*)
7070
@@ -196,6 +196,7 @@
196Default_is_NULL196Default_is_NULL
197ENGINE197ENGINE
198ENGINE198ENGINE
199ENUM_VALUES
199EXECUTION_TIME_NSEC200EXECUTION_TIME_NSEC
200EXTERNAL_LANGUAGE201EXTERNAL_LANGUAGE
201EXTERNAL_NAME202EXTERNAL_NAME
@@ -222,6 +223,7 @@
222INTERVAL_TYPE223INTERVAL_TYPE
223IP224IP
224IS_ACTIVE225IS_ACTIVE
226IS_AUTO_INCREMENT
225IS_BUILTIN227IS_BUILTIN
226IS_COMPILED228IS_COMPILED
227IS_DEFAULT229IS_DEFAULT
@@ -530,6 +532,7 @@
530 `COLUMN_DEFAULT` VARBINARY(65535) DEFAULT NULL,532 `COLUMN_DEFAULT` VARBINARY(65535) DEFAULT NULL,
531 `COLUMN_DEFAULT_IS_NULL` VARCHAR(5) NOT NULL,533 `COLUMN_DEFAULT_IS_NULL` VARCHAR(5) NOT NULL,
532 `COLUMN_DEFAULT_UPDATE` VARCHAR(256) NOT NULL,534 `COLUMN_DEFAULT_UPDATE` VARCHAR(256) NOT NULL,
535 `IS_AUTO_INCREMENT` VARCHAR(5) NOT NULL,
533 `IS_NULLABLE` VARCHAR(5) NOT NULL,536 `IS_NULLABLE` VARCHAR(5) NOT NULL,
534 `IS_INDEXED` VARCHAR(5) NOT NULL,537 `IS_INDEXED` VARCHAR(5) NOT NULL,
535 `IS_USED_IN_PRIMARY` VARCHAR(5) NOT NULL,538 `IS_USED_IN_PRIMARY` VARCHAR(5) NOT NULL,
@@ -542,6 +545,7 @@
542 `CHARACTER_OCTET_LENGTH` BIGINT DEFAULT NULL,545 `CHARACTER_OCTET_LENGTH` BIGINT DEFAULT NULL,
543 `NUMERIC_PRECISION` BIGINT DEFAULT NULL,546 `NUMERIC_PRECISION` BIGINT DEFAULT NULL,
544 `NUMERIC_SCALE` BIGINT DEFAULT NULL,547 `NUMERIC_SCALE` BIGINT DEFAULT NULL,
548 `ENUM_VALUES` VARCHAR(1024) DEFAULT NULL,
545 `COLLATION_NAME` VARCHAR(256) NOT NULL,549 `COLLATION_NAME` VARCHAR(256) NOT NULL,
546 `COLUMN_COMMENT` VARCHAR(1024) DEFAULT NULL550 `COLUMN_COMMENT` VARCHAR(1024) DEFAULT NULL
547) ENGINE=FunctionEngine COLLATE = utf8_general_ci551) ENGINE=FunctionEngine COLLATE = utf8_general_ci
@@ -647,7 +651,9 @@
647DATA_DICTIONARY COLUMNS COLUMN_NAME651DATA_DICTIONARY COLUMNS COLUMN_NAME
648DATA_DICTIONARY COLUMNS COLUMN_TYPE652DATA_DICTIONARY COLUMNS COLUMN_TYPE
649DATA_DICTIONARY COLUMNS DATA_TYPE653DATA_DICTIONARY COLUMNS DATA_TYPE
654DATA_DICTIONARY COLUMNS ENUM_VALUES
650DATA_DICTIONARY COLUMNS INDEXES_FOUND_IN655DATA_DICTIONARY COLUMNS INDEXES_FOUND_IN
656DATA_DICTIONARY COLUMNS IS_AUTO_INCREMENT
651DATA_DICTIONARY COLUMNS IS_FIRST_IN_MULTI657DATA_DICTIONARY COLUMNS IS_FIRST_IN_MULTI
652DATA_DICTIONARY COLUMNS IS_INDEXED658DATA_DICTIONARY COLUMNS IS_INDEXED
653DATA_DICTIONARY COLUMNS IS_MULTI659DATA_DICTIONARY COLUMNS IS_MULTI
@@ -1150,7 +1156,9 @@
1150COLUMNS DATA_DICTIONARY COLUMN_NAME1156COLUMNS DATA_DICTIONARY COLUMN_NAME
1151COLUMNS DATA_DICTIONARY COLUMN_TYPE1157COLUMNS DATA_DICTIONARY COLUMN_TYPE
1152COLUMNS DATA_DICTIONARY DATA_TYPE1158COLUMNS DATA_DICTIONARY DATA_TYPE
1159COLUMNS DATA_DICTIONARY ENUM_VALUES
1153COLUMNS DATA_DICTIONARY INDEXES_FOUND_IN1160COLUMNS DATA_DICTIONARY INDEXES_FOUND_IN
1161COLUMNS DATA_DICTIONARY IS_AUTO_INCREMENT
1154COLUMNS DATA_DICTIONARY IS_FIRST_IN_MULTI1162COLUMNS DATA_DICTIONARY IS_FIRST_IN_MULTI
1155COLUMNS DATA_DICTIONARY IS_INDEXED1163COLUMNS DATA_DICTIONARY IS_INDEXED
1156COLUMNS DATA_DICTIONARY IS_MULTI1164COLUMNS DATA_DICTIONARY IS_MULTI
@@ -1650,7 +1658,9 @@
1650COLUMNS DATA_DICTIONARY COLUMN_NAME1658COLUMNS DATA_DICTIONARY COLUMN_NAME
1651COLUMNS DATA_DICTIONARY COLUMN_TYPE1659COLUMNS DATA_DICTIONARY COLUMN_TYPE
1652COLUMNS DATA_DICTIONARY DATA_TYPE1660COLUMNS DATA_DICTIONARY DATA_TYPE
1661COLUMNS DATA_DICTIONARY ENUM_VALUES
1653COLUMNS DATA_DICTIONARY INDEXES_FOUND_IN1662COLUMNS DATA_DICTIONARY INDEXES_FOUND_IN
1663COLUMNS DATA_DICTIONARY IS_AUTO_INCREMENT
1654COLUMNS DATA_DICTIONARY IS_FIRST_IN_MULTI1664COLUMNS DATA_DICTIONARY IS_FIRST_IN_MULTI
1655COLUMNS DATA_DICTIONARY IS_INDEXED1665COLUMNS DATA_DICTIONARY IS_INDEXED
1656COLUMNS DATA_DICTIONARY IS_MULTI1666COLUMNS DATA_DICTIONARY IS_MULTI
16571667
=== modified file 'tests/r/data_dictionary_like_info.result'
--- tests/r/data_dictionary_like_info.result 2010-09-10 16:41:50 +0000
+++ tests/r/data_dictionary_like_info.result 2010-09-21 18:57:45 +0000
@@ -39,8 +39,8 @@
39a INTEGER YES YES 39a INTEGER YES YES
40select * from data_dictionary.COLUMNS where table_name="t1"40select * from data_dictionary.COLUMNS where table_name="t1"
41and column_name= "a";41and column_name= "a";
42TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_TYPE ORDINAL_POSITION COLUMN_DEFAULT COLUMN_DEFAULT_IS_NULL COLUMN_DEFAULT_UPDATE IS_NULLABLE IS_INDEXED IS_USED_IN_PRIMARY IS_UNIQUE IS_MULTI IS_FIRST_IN_MULTI INDEXES_FOUND_IN DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE COLLATION_NAME COLUMN_COMMENT42TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_TYPE ORDINAL_POSITION COLUMN_DEFAULT COLUMN_DEFAULT_IS_NULL COLUMN_DEFAULT_UPDATE IS_AUTO_INCREMENT IS_NULLABLE IS_INDEXED IS_USED_IN_PRIMARY IS_UNIQUE IS_MULTI IS_FIRST_IN_MULTI INDEXES_FOUND_IN DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE ENUM_VALUES COLLATION_NAME COLUMN_COMMENT
43mysqltest t1 a INTEGER 0 NULL YES YES NO NO NO NO NO 0 INTEGER 0 0 0 0 NULL43mysqltest t1 a INTEGER 0 NULL YES NO YES NO NO NO NO NO 0 INTEGER 0 0 0 0 NULL NULL
44select table_name, column_name from data_dictionary.columns 44select table_name, column_name from data_dictionary.columns
45where table_schema = 'mysqltest' and table_name = 't1';45where table_schema = 'mysqltest' and table_name = 't1';
46table_name column_name46table_name column_name
@@ -191,7 +191,7 @@
191 or DATA_TYPE = 'varchar')191 or DATA_TYPE = 'varchar')
192group by DATA_TYPE order by DATA_TYPE, num;192group by DATA_TYPE order by DATA_TYPE, num;
193DATA_TYPE a num193DATA_TYPE a num
194VARCHAR # 166194VARCHAR # 168
195Warnings:195Warnings:
196Warning # 1 line(s) were cut by GROUP_CONCAT()196Warning # 1 line(s) were cut by GROUP_CONCAT()
197create table t1(f1 char(1) not null, f2 char(9) not null);197create table t1(f1 char(1) not null, f2 char(9) not null);
@@ -331,9 +331,9 @@
331WHERE TABLE_SCHEMA='mysql' and TABLE_NAME= 'db';331WHERE TABLE_SCHEMA='mysql' and TABLE_NAME= 'db';
332TABLE_COLLATION332TABLE_COLLATION
333select * from data_dictionary.columns where table_schema = NULL;333select * from data_dictionary.columns where table_schema = NULL;
334TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_TYPE ORDINAL_POSITION COLUMN_DEFAULT COLUMN_DEFAULT_IS_NULL COLUMN_DEFAULT_UPDATE IS_NULLABLE IS_INDEXED IS_USED_IN_PRIMARY IS_UNIQUE IS_MULTI IS_FIRST_IN_MULTI INDEXES_FOUND_IN DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE COLLATION_NAME COLUMN_COMMENT334TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_TYPE ORDINAL_POSITION COLUMN_DEFAULT COLUMN_DEFAULT_IS_NULL COLUMN_DEFAULT_UPDATE IS_AUTO_INCREMENT IS_NULLABLE IS_INDEXED IS_USED_IN_PRIMARY IS_UNIQUE IS_MULTI IS_FIRST_IN_MULTI INDEXES_FOUND_IN DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE ENUM_VALUES COLLATION_NAME COLUMN_COMMENT
335select * from `data_dictionary`.`COLUMNS` where `TABLE_NAME` = NULL;335select * from `data_dictionary`.`COLUMNS` where `TABLE_NAME` = NULL;
336TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_TYPE ORDINAL_POSITION COLUMN_DEFAULT COLUMN_DEFAULT_IS_NULL COLUMN_DEFAULT_UPDATE IS_NULLABLE IS_INDEXED IS_USED_IN_PRIMARY IS_UNIQUE IS_MULTI IS_FIRST_IN_MULTI INDEXES_FOUND_IN DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE COLLATION_NAME COLUMN_COMMENT336TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_TYPE ORDINAL_POSITION COLUMN_DEFAULT COLUMN_DEFAULT_IS_NULL COLUMN_DEFAULT_UPDATE IS_AUTO_INCREMENT IS_NULLABLE IS_INDEXED IS_USED_IN_PRIMARY IS_UNIQUE IS_MULTI IS_FIRST_IN_MULTI INDEXES_FOUND_IN DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE ENUM_VALUES COLLATION_NAME COLUMN_COMMENT
337select * from `data_dictionary`.`INDEXES` where `TABLE_SCHEMA` = NULL;337select * from `data_dictionary`.`INDEXES` where `TABLE_SCHEMA` = NULL;
338TABLE_SCHEMA TABLE_NAME INDEX_NAME IS_USED_IN_PRIMARY IS_UNIQUE IS_NULLABLE KEY_LENGTH INDEX_TYPE INDEX_COMMENT338TABLE_SCHEMA TABLE_NAME INDEX_NAME IS_USED_IN_PRIMARY IS_UNIQUE IS_NULLABLE KEY_LENGTH INDEX_TYPE INDEX_COMMENT
339select * from `data_dictionary`.`INDEXES` where `TABLE_NAME` = NULL;339select * from `data_dictionary`.`INDEXES` where `TABLE_NAME` = NULL;
340340
=== modified file 'tests/r/information_schema.result'
--- tests/r/information_schema.result 2010-09-10 16:41:50 +0000
+++ tests/r/information_schema.result 2010-09-21 18:57:45 +0000
@@ -27,8 +27,8 @@
27a INTEGER YES YES 27a INTEGER YES YES
28select * from data_dictionary.columns where table_name="t1"28select * from data_dictionary.columns where table_name="t1"
29and column_name= "a";29and column_name= "a";
30TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_TYPE ORDINAL_POSITION COLUMN_DEFAULT COLUMN_DEFAULT_IS_NULL COLUMN_DEFAULT_UPDATE IS_NULLABLE IS_INDEXED IS_USED_IN_PRIMARY IS_UNIQUE IS_MULTI IS_FIRST_IN_MULTI INDEXES_FOUND_IN DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE COLLATION_NAME COLUMN_COMMENT30TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_TYPE ORDINAL_POSITION COLUMN_DEFAULT COLUMN_DEFAULT_IS_NULL COLUMN_DEFAULT_UPDATE IS_AUTO_INCREMENT IS_NULLABLE IS_INDEXED IS_USED_IN_PRIMARY IS_UNIQUE IS_MULTI IS_FIRST_IN_MULTI INDEXES_FOUND_IN DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE ENUM_VALUES COLLATION_NAME COLUMN_COMMENT
31mysqltest t1 a INTEGER 0 NULL YES YES NO NO NO NO NO 0 INTEGER 0 0 0 0 NULL31mysqltest t1 a INTEGER 0 NULL YES NO YES NO NO NO NO NO 0 INTEGER 0 0 0 0 NULL NULL
32select table_name, column_name from data_dictionary.columns 32select table_name, column_name from data_dictionary.columns
33where table_schema = 'mysqltest' and table_name = 't1';33where table_schema = 'mysqltest' and table_name = 't1';
34table_name column_name34table_name column_name
3535
=== modified file 'tests/r/randgen_queries.result'
--- tests/r/randgen_queries.result 2010-07-21 19:15:45 +0000
+++ tests/r/randgen_queries.result 2010-09-21 18:57:45 +0000
@@ -79,7 +79,7 @@
79DATA_DICTIONARY COLUMNS function COLUMN_DEFAULT indexed79DATA_DICTIONARY COLUMNS function COLUMN_DEFAULT indexed
80DATA_DICTIONARY COLUMNS function COLUMN_DEFAULT_IS_NULL indexed80DATA_DICTIONARY COLUMNS function COLUMN_DEFAULT_IS_NULL indexed
81DATA_DICTIONARY COLUMNS function COLUMN_DEFAULT_UPDATE indexed81DATA_DICTIONARY COLUMNS function COLUMN_DEFAULT_UPDATE indexed
82DATA_DICTIONARY COLUMNS function IS_NULLABLE indexed82DATA_DICTIONARY COLUMNS function IS_AUTO_INCREMENT indexed
83CREATE SCHEMA randgen_query_test;83CREATE SCHEMA randgen_query_test;
84USE randgen_query_test;84USE randgen_query_test;
85CREATE TABLE t1 (a INT);85CREATE TABLE t1 (a INT);
8686
=== modified file 'tests/t/drizzledump.test'
--- tests/t/drizzledump.test 2010-09-14 22:20:42 +0000
+++ tests/t/drizzledump.test 2010-09-21 18:57:45 +0000
@@ -88,7 +88,7 @@
8888
89CREATE TABLE t1 (`b` blob);89CREATE TABLE t1 (`b` blob);
90INSERT INTO `t1` VALUES (0x602010000280100005E71A);90INSERT INTO `t1` VALUES (0x602010000280100005E71A);
91--exec $DRIZZLE_DUMP --skip-extended-insert --hex-blob test --skip-comments t191--exec $DRIZZLE_DUMP --skip-extended-insert test --skip-comments t1
92DROP TABLE t1;92DROP TABLE t1;
9393
94--echo #94--echo #
9595
=== modified file 'tests/t/drizzledump_restore.test'
--- tests/t/drizzledump_restore.test 2010-07-02 16:14:31 +0000
+++ tests/t/drizzledump_restore.test 2010-09-21 18:57:45 +0000
@@ -79,7 +79,7 @@
79--echo #79--echo #
80CREATE TABLE t1 (`b` blob);80CREATE TABLE t1 (`b` blob);
81INSERT INTO `t1` VALUES (0x602010000280100005E71A);81INSERT INTO `t1` VALUES (0x602010000280100005E71A);
82--exec $DRIZZLE_DUMP --skip-extended-insert --hex-blob test --skip-comments t1 > $drizzledumpfile82--exec $DRIZZLE_DUMP --skip-extended-insert test --skip-comments t1 > $drizzledumpfile
83let $table_name = test.t1;83let $table_name = test.t1;
84--source include/drizzledump.inc84--source include/drizzledump.inc
8585