← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/r/drizzledump.result

Merging change info_schema changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/r/drizzledump.result
12
12
<drizzledump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
13
<database name="test">
14
14
        <table_structure name="t1">
15
 
                <field Field="a" Type="int" Null="YES" Key="MUL" Extra="" />
16
 
                <key Table="t1" Non_unique="1" Key_name="a" Seq_in_index="1" Column_name="a" Collation="A" Cardinality="2" Null="YES" Index_type="BTREE" Comment="" Index_Comment="" />
 
15
                <field Field="a" Type="INTEGER" Null="TRUE" Default="" Default is NULL="TRUE" On Update="" />
 
16
                <key Table="t1" Key_name="a" Seq_in_index="0" Column_name="a" />
17
17
        </table_structure>
18
18
        <table_data name="t1">
19
19
        <row>
46
46
<drizzledump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
47
47
<database name="test">
48
48
        <table_structure name="t1">
49
 
                <field Field="a&quot;b&quot;" Type="varchar(2)" Null="YES" Key="" Extra="" />
 
49
                <field Field="a&quot;b&quot;" Type="VARCHAR" Null="TRUE" Default="" Default is NULL="TRUE" On Update="" />
50
50
        </table_structure>
51
51
        <table_data name="t1">
52
52
        <row>
947
947
<drizzledump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
948
948
<database name="mysqldump_test_db">
949
949
        <table_structure name="t1">
950
 
                <field Field="a" Type="int" Null="YES" Key="" Extra="" />
 
950
                <field Field="a" Type="INTEGER" Null="TRUE" Default="" Default is NULL="TRUE" On Update="" />
951
951
        </table_structure>
952
952
        <table_structure name="t2">
953
 
                <field Field="a" Type="int" Null="YES" Key="" Extra="" />
 
953
                <field Field="a" Type="INTEGER" Null="TRUE" Default="" Default is NULL="TRUE" On Update="" />
954
954
        </table_structure>
955
955
</database>
956
956
</drizzledump>
958
958
<drizzledump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
959
959
<database name="mysqldump_test_db">
960
960
        <table_structure name="t1">
961
 
                <field Field="a" Type="int" Null="YES" Key="" Extra="" />
 
961
                <field Field="a" Type="INTEGER" Null="TRUE" Default="" Default is NULL="TRUE" On Update="" />
962
962
        </table_structure>
963
963
        <table_structure name="t2">
964
 
                <field Field="a" Type="int" Null="YES" Key="" Extra="" />
 
964
                <field Field="a" Type="INTEGER" Null="TRUE" Default="" Default is NULL="TRUE" On Update="" />
965
965
        </table_structure>
966
966
</database>
967
967
</drizzledump>
1144
1144
#
1145
1145
# BUG#13926: --order-by-primary fails if PKEY contains quote character
1146
1146
#
1147
 
DROP TABLE IF EXISTS `t1`;
1148
 
CREATE TABLE `t1` (
1149
 
`a b` INT,
1150
 
`c"d` INT,
1151
 
`e``f` INT,
1152
 
PRIMARY KEY (`a b`, `c"d`, `e``f`)
1153
 
);
1154
 
insert into t1 values (0815, 4711, 2006);
1155
 
SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
1156
 
SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
1157
 
DROP TABLE IF EXISTS `t1`;
1158
 
CREATE TABLE `t1` (
1159
 
  `a b` int NOT NULL,
1160
 
  `c"d` int NOT NULL,
1161
 
  `e``f` int NOT NULL,
1162
 
  PRIMARY KEY (`a b`,`c"d`,`e``f`)
1163
 
) ENGINE=InnoDB;
1164
 
 
1165
 
ALTER TABLE `t1` DISABLE KEYS;
1166
 
INSERT INTO `t1` VALUES (815,4711,2006);
1167
 
ALTER TABLE `t1` ENABLE KEYS;
1168
 
SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
1169
 
SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
1170
 
SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
1171
 
SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
1172
 
DROP TABLE IF EXISTS `t1`;
1173
 
CREATE TABLE `t1` (
1174
 
  `a b` int NOT NULL,
1175
 
  `c"d` int NOT NULL,
1176
 
  `e``f` int NOT NULL,
1177
 
  PRIMARY KEY (`a b`,`c"d`,`e``f`)
1178
 
) ENGINE=InnoDB;
1179
 
 
1180
 
ALTER TABLE `t1` DISABLE KEYS;
1181
 
INSERT INTO `t1` VALUES (815,4711,2006);
1182
 
ALTER TABLE `t1` ENABLE KEYS;
1183
 
SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
1184
 
SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
1185
 
DROP TABLE `t1`;
1186
1147
End of 4.1 tests
1187
1148
#
1188
1149
# Bug#29815: new option for suppressing last line of mysqldump: