Drizzle

Merge lp:~patrick-crews/drizzle/bug823616 into lp:~drizzle-trunk/drizzle/development

  1. bug823616
  2. Merge into development
Proposed by Patrick Crews
Status: Merged
Approved by: Mark Atwood
Approved revision: 2391
Merged at revision: 2393
Proposed branch: lp:~patrick-crews/drizzle/bug823616
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 37 lines (+8/-1)
2 files modified
plugin/slave/tests/r/basic.result (+7/-1)
plugin/slave/tests/t/basic.test (+1/-0)
To merge this branch: bzr merge lp:~patrick-crews/drizzle/bug823616
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+70965@code.launchpad.net

Description of the change

Updated .test and .result file to deal with new SHOW CREATE TABLE output (USING BTREE)

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
1=== modified file 'plugin/slave/tests/r/basic.result'
2--- plugin/slave/tests/r/basic.result 2011-03-09 20:04:11 +0000
3+++ plugin/slave/tests/r/basic.result 2011-08-09 23:23:14 +0000
4@@ -1,6 +1,12 @@
5 DROP TABLE IF EXISTS t1;
6 Populating master server
7 CREATE TABLE t1 (a int not null auto_increment, primary key(a));
8+SHOW CREATE TABLE t1;
9+Table Create Table
10+t1 CREATE TABLE `t1` (
11+ `a` INT NOT NULL AUTO_INCREMENT,
12+ PRIMARY KEY (`a`) USING BTREE
13+) ENGINE=InnoDB COLLATE = utf8_general_ci
14 INSERT INTO t1 VALUES (),(),();
15 SELECT * FROM t1;
16 a
17@@ -14,7 +20,7 @@
18 Table Create Table
19 t1 CREATE TABLE `t1` (
20 `a` INT NOT NULL AUTO_INCREMENT,
21- PRIMARY KEY (`a`)
22+ PRIMARY KEY (`a`) USING BTREE
23 ) ENGINE=InnoDB COLLATE = utf8_general_ci
24 SELECT * FROM t1;
25 a
26
27=== modified file 'plugin/slave/tests/t/basic.test'
28--- plugin/slave/tests/t/basic.test 2011-03-24 00:34:19 +0000
29+++ plugin/slave/tests/t/basic.test 2011-08-09 23:23:14 +0000
30@@ -5,6 +5,7 @@
31 --echo Populating master server
32
33 CREATE TABLE t1 (a int not null auto_increment, primary key(a));
34+SHOW CREATE TABLE t1;
35 INSERT INTO t1 VALUES (),(),();
36 SELECT * FROM t1;
37 # We wait a bit for the slave