← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/tests/r/parser_bug21114_innodb.result

  • Committer: Mark Atwood
  • Date: 2011-07-18 21:41:28 UTC
  • mfrom: (2363.1.5 drizzle-trunk)
  • Revision ID: me@mark.atwood.name-20110718214128-tj8my4mqt62dslxn
merge lp:~brianaker/drizzle/798940

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/tests/r/parser_bug21114_innodb.result
6
6
  `col1` INT NOT NULL,
7
7
  `col2` INT NOT NULL,
8
8
  `col3` VARCHAR(10) COLLATE utf8_general_ci DEFAULT NULL,
9
 
  PRIMARY KEY (`col1`,`col2`)
 
9
  PRIMARY KEY (`col1`,`col2`) USING BTREE
10
10
) ENGINE=InnoDB COLLATE = utf8_general_ci
11
11
SHOW CREATE TABLE bug21114_child;
12
12
Table   Create Table
16
16
  `fk_col2` INT NOT NULL,
17
17
  `fk_col3` INT NOT NULL,
18
18
  `fk_col4` INT NOT NULL,
19
 
  KEY `fk_fct` (`fk_col1`,`fk_col2`),
20
 
  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
 
19
  KEY `fk_fct` (`fk_col1`,`fk_col2`) USING BTREE,
 
20
  KEY `fk_fct_space` (`fk_col3`,`fk_col4`) USING BTREE,
21
21
  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `abs` (`col1`, `col2`),
22
22
  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `abs` (`col1`, `col2`)
23
23
) ENGINE=InnoDB COLLATE = utf8_general_ci
31
31
  `col1` INT NOT NULL,
32
32
  `col2` INT NOT NULL,
33
33
  `col3` VARCHAR(10) COLLATE utf8_general_ci DEFAULT NULL,
34
 
  PRIMARY KEY (`col1`,`col2`)
 
34
  PRIMARY KEY (`col1`,`col2`) USING BTREE
35
35
) ENGINE=InnoDB COLLATE = utf8_general_ci
36
36
SHOW CREATE TABLE bug21114_child;
37
37
Table   Create Table
41
41
  `fk_col2` INT NOT NULL,
42
42
  `fk_col3` INT NOT NULL,
43
43
  `fk_col4` INT NOT NULL,
44
 
  KEY `fk_fct` (`fk_col1`,`fk_col2`),
45
 
  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
 
44
  KEY `fk_fct` (`fk_col1`,`fk_col2`) USING BTREE,
 
45
  KEY `fk_fct_space` (`fk_col3`,`fk_col4`) USING BTREE,
46
46
  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `field` (`col1`, `col2`),
47
47
  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `field` (`col1`, `col2`)
48
48
) ENGINE=InnoDB COLLATE = utf8_general_ci
56
56
  `col1` INT NOT NULL,
57
57
  `col2` INT NOT NULL,
58
58
  `col3` VARCHAR(10) COLLATE utf8_general_ci DEFAULT NULL,
59
 
  PRIMARY KEY (`col1`,`col2`)
 
59
  PRIMARY KEY (`col1`,`col2`) USING BTREE
60
60
) ENGINE=InnoDB COLLATE = utf8_general_ci
61
61
SHOW CREATE TABLE bug21114_child;
62
62
Table   Create Table
66
66
  `fk_col2` INT NOT NULL,
67
67
  `fk_col3` INT NOT NULL,
68
68
  `fk_col4` INT NOT NULL,
69
 
  KEY `fk_fct` (`fk_col1`,`fk_col2`),
70
 
  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
 
69
  KEY `fk_fct` (`fk_col1`,`fk_col2`) USING BTREE,
 
70
  KEY `fk_fct_space` (`fk_col3`,`fk_col4`) USING BTREE,
71
71
  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `format` (`col1`, `col2`),
72
72
  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `format` (`col1`, `col2`)
73
73
) ENGINE=InnoDB COLLATE = utf8_general_ci