Drizzle

Merge lp:~linuxjedi/drizzle/drizzle-bug-634374-embedded-innodb into lp:~drizzle-trunk/drizzle/development

  1. drizzle-bug-634374-embedded-innodb
  2. Merge into development
Proposed by Andrew Hutchings
Status: Merged
Approved by: Lee Bieber
Approved revision: 1756
Merged at revision: 1757
Proposed branch: lp:~linuxjedi/drizzle/drizzle-bug-634374-embedded-innodb
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 288 lines (+42/-39)
8 files modified
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob.result (+3/-3)
plugin/schema_dictionary/tests/r/show.result (+20/-20)
plugin/show_dictionary/show_columns.cc (+8/-5)
plugin/show_dictionary/show_columns.h (+1/-1)
tests/r/type_blob.result (+3/-3)
tests/r/type_datetime.result (+2/-2)
tests/r/type_ranges.result (+3/-3)
tests/r/union.result (+2/-2)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/drizzle-bug-634374-embedded-innodb
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Drizzle Merge Team Pending
Review via email: mp+35175@code.launchpad.net

Description of the change

Fix embedded test which broken when merging drizzle-bug-634374

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob.result 2010-09-08 10:02:37 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob.result 2010-09-10 22:17:06 +0000
@@ -3,10 +3,10 @@
3show columns from t1;3show columns from t1;
4Field Type Null Default Default_is_NULL On_Update4Field Type Null Default Default_is_NULL On_Update
5a BLOB YES YES 5a BLOB YES YES
6b BLOB YES YES 6b TEXT YES YES
7c BLOB YES YES 7c BLOB YES YES
8d BLOB YES YES 8d TEXT YES YES
9e BLOB YES YES 9e TEXT YES YES
10CREATE TABLE t2 (a varchar(255), b blob, c blob);10CREATE TABLE t2 (a varchar(255), b blob, c blob);
11CREATE TABLE t4 (c varchar(16383) not null);11CREATE TABLE t4 (c varchar(16383) not null);
12show columns from t2;12show columns from t2;
1313
=== modified file 'plugin/schema_dictionary/tests/r/show.result'
--- plugin/schema_dictionary/tests/r/show.result 2010-09-02 18:35:05 +0000
+++ plugin/schema_dictionary/tests/r/show.result 2010-09-10 22:17:06 +0000
@@ -677,27 +677,27 @@
677show columns from container;677show columns from container;
678Field Type Null Default Default_is_NULL On_Update678Field Type Null Default Default_is_NULL On_Update
679container_id INTEGER NO NO 679container_id INTEGER NO NO
680context BLOB YES YES 680context TEXT YES YES
681parent_container INTEGER YES YES 681parent_container INTEGER YES YES
682show columns from document;682show columns from document;
683Field Type Null Default Default_is_NULL On_Update683Field Type Null Default Default_is_NULL On_Update
684document_id INTEGER NO NO 684document_id INTEGER NO NO
685doctext BLOB YES YES 685doctext TEXT YES YES
686show columns from genstats_attributes;686show columns from genstats_attributes;
687Field Type Null Default Default_is_NULL On_Update687Field Type Null Default Default_is_NULL On_Update
688genstats_attributes_id INTEGER NO 0 NO 688genstats_attributes_id INTEGER NO 0 NO
689predicates BLOB NO NO 689predicates TEXT NO NO
690attributes BLOB NO NO 690attributes TEXT NO NO
691show columns from htmlcode;691show columns from htmlcode;
692Field Type Null Default Default_is_NULL On_Update692Field Type Null Default Default_is_NULL On_Update
693htmlcode_id INTEGER NO NO 693htmlcode_id INTEGER NO NO
694code BLOB YES YES 694code TEXT YES YES
695show columns from htmlpage;695show columns from htmlpage;
696Field Type Null Default Default_is_NULL On_Update696Field Type Null Default Default_is_NULL On_Update
697htmlpage_id INTEGER NO NO 697htmlpage_id INTEGER NO NO
698pagetype_nodetype INTEGER YES YES 698pagetype_nodetype INTEGER YES YES
699displaytype VARCHAR YES YES 699displaytype VARCHAR YES YES
700page BLOB YES YES 700page TEXT YES YES
701parent_container INTEGER YES YES 701parent_container INTEGER YES YES
702ownedby_theme INTEGER NO 0 NO 702ownedby_theme INTEGER NO 0 NO
703permissionneeded VARCHAR NO r NO 703permissionneeded VARCHAR NO r NO
@@ -708,17 +708,17 @@
708src VARCHAR YES YES 708src VARCHAR YES YES
709alt VARCHAR YES YES 709alt VARCHAR YES YES
710thumbsrc VARCHAR YES YES 710thumbsrc VARCHAR YES YES
711description BLOB YES YES 711description TEXT YES YES
712show columns from javascript;712show columns from javascript;
713Field Type Null Default Default_is_NULL On_Update713Field Type Null Default Default_is_NULL On_Update
714javascript_id INTEGER NO 0 NO 714javascript_id INTEGER NO 0 NO
715code BLOB NO NO 715code TEXT NO NO
716comment BLOB NO NO 716comment TEXT NO NO
717dynamic INTEGER NO 0 NO 717dynamic INTEGER NO 0 NO
718show columns from knowledge_item;718show columns from knowledge_item;
719Field Type Null Default Default_is_NULL On_Update719Field Type Null Default Default_is_NULL On_Update
720knowledge_item_id INTEGER NO 0 NO 720knowledge_item_id INTEGER NO 0 NO
721item BLOB NO NO 721item TEXT NO NO
722question INTEGER NO 0 NO 722question INTEGER NO 0 NO
723show columns from links;723show columns from links;
724Field Type Null Default Default_is_NULL On_Update724Field Type Null Default Default_is_NULL On_Update
@@ -763,8 +763,8 @@
763show columns from nodelet;763show columns from nodelet;
764Field Type Null Default Default_is_NULL On_Update764Field Type Null Default Default_is_NULL On_Update
765nodelet_id INTEGER NO NO 765nodelet_id INTEGER NO NO
766nltext BLOB YES YES 766nltext TEXT YES YES
767nlcode BLOB YES YES 767nlcode TEXT YES YES
768nlgoto INTEGER YES YES 768nlgoto INTEGER YES YES
769parent_container INTEGER YES YES 769parent_container INTEGER YES YES
770lastupdate INTEGER NO 0 NO 770lastupdate INTEGER NO 0 NO
@@ -774,7 +774,7 @@
774Field Type Null Default Default_is_NULL On_Update774Field Type Null Default Default_is_NULL On_Update
775nodemethod_id INTEGER NO 0 NO 775nodemethod_id INTEGER NO 0 NO
776supports_nodetype INTEGER NO 0 NO 776supports_nodetype INTEGER NO 0 NO
777code BLOB NO NO 777code TEXT NO NO
778show columns from nodetype;778show columns from nodetype;
779Field Type Null Default Default_is_NULL On_Update779Field Type Null Default Default_is_NULL On_Update
780nodetype_id INTEGER NO NO 780nodetype_id INTEGER NO NO
@@ -797,12 +797,12 @@
797show columns from project;797show columns from project;
798Field Type Null Default Default_is_NULL On_Update798Field Type Null Default Default_is_NULL On_Update
799project_id INTEGER NO 0 NO 799project_id INTEGER NO 0 NO
800description BLOB NO NO 800description TEXT NO NO
801last_update TIMESTAMP NO CURRENT_TIMESTAMP NO CURRENT_TIMESTAMP801last_update TIMESTAMP NO CURRENT_TIMESTAMP NO CURRENT_TIMESTAMP
802short_description VARCHAR NO NO 802short_description VARCHAR NO NO
803url_cvs VARCHAR NO NO 803url_cvs VARCHAR NO NO
804url_faq VARCHAR NO NO 804url_faq VARCHAR NO NO
805long_description BLOB NO NO 805long_description TEXT NO NO
806show columns from project_document;806show columns from project_document;
807Field Type Null Default Default_is_NULL On_Update807Field Type Null Default Default_is_NULL On_Update
808project_document_id INTEGER NO 0 NO 808project_document_id INTEGER NO 0 NO
@@ -814,16 +814,16 @@
814project_id INTEGER NO 0 NO 814project_id INTEGER NO 0 NO
815rank INTEGER NO 0 NO 815rank INTEGER NO 0 NO
816orderby INTEGER NO 0 NO 816orderby INTEGER NO 0 NO
817description BLOB NO NO 817description TEXT NO NO
818show columns from redirects;818show columns from redirects;
819Field Type Null Default Default_is_NULL On_Update819Field Type Null Default Default_is_NULL On_Update
820redirects_id INTEGER NO 0 NO 820redirects_id INTEGER NO 0 NO
821url BLOB NO NO 821url TEXT NO NO
822show columns from releases;822show columns from releases;
823Field Type Null Default Default_is_NULL On_Update823Field Type Null Default Default_is_NULL On_Update
824releases_id INTEGER NO 0 NO 824releases_id INTEGER NO 0 NO
825branch_id INTEGER NO 0 NO 825branch_id INTEGER NO 0 NO
826description BLOB YES YES 826description TEXT YES YES
827url_targz VARCHAR NO NO 827url_targz VARCHAR NO NO
828url_osx VARCHAR NO NO 828url_osx VARCHAR NO NO
829url_rpm VARCHAR NO NO 829url_rpm VARCHAR NO NO
@@ -836,12 +836,12 @@
836node_id INTEGER NO 0 NO 836node_id INTEGER NO 0 NO
837inside_workspace INTEGER NO 0 NO 837inside_workspace INTEGER NO 0 NO
838revision_id INTEGER NO 0 NO 838revision_id INTEGER NO 0 NO
839xml BLOB NO NO 839xml TEXT NO NO
840tstamp TIMESTAMP NO CURRENT_TIMESTAMP NO CURRENT_TIMESTAMP840tstamp TIMESTAMP NO CURRENT_TIMESTAMP NO CURRENT_TIMESTAMP
841show columns from setting;841show columns from setting;
842Field Type Null Default Default_is_NULL On_Update842Field Type Null Default Default_is_NULL On_Update
843setting_id INTEGER NO NO 843setting_id INTEGER NO NO
844vars BLOB NO NO 844vars TEXT NO NO
845show columns from symlink;845show columns from symlink;
846Field Type Null Default Default_is_NULL On_Update846Field Type Null Default Default_is_NULL On_Update
847symlink_id INTEGER NO 0 NO 847symlink_id INTEGER NO 0 NO
848848
=== modified file 'plugin/show_dictionary/show_columns.cc'
--- plugin/show_dictionary/show_columns.cc 2010-07-30 19:21:23 +0000
+++ plugin/show_dictionary/show_columns.cc 2010-09-10 22:17:06 +0000
@@ -21,14 +21,17 @@
21#include "config.h"21#include "config.h"
22#include "plugin/show_dictionary/dictionary.h"22#include "plugin/show_dictionary/dictionary.h"
23#include "drizzled/identifier.h"23#include "drizzled/identifier.h"
2424#include <string>
2525
26using namespace std;26using namespace std;
27using namespace drizzled;27using namespace drizzled;
2828
29static const string VARCHAR("VARCHAR");29static const string VARCHAR("VARCHAR");
30/* VARBINARY already defined elsewhere */
31static const string VARBIN("VARBINARY");
30static const string DOUBLE("DOUBLE");32static const string DOUBLE("DOUBLE");
31static const string BLOB("BLOB");33static const string BLOB("BLOB");
34static const string TEXT("TEXT");
32static const string ENUM("ENUM");35static const string ENUM("ENUM");
33static const string INTEGER("INTEGER");36static const string INTEGER("INTEGER");
34static const string BIGINT("BIGINT");37static const string BIGINT("BIGINT");
@@ -112,19 +115,19 @@
112 return true;115 return true;
113}116}
114117
115void ShowColumns::Generator::pushType(message::Table::Field::FieldType type)118void ShowColumns::Generator::pushType(message::Table::Field::FieldType type, const string collation)
116{119{
117 switch (type)120 switch (type)
118 {121 {
119 default:122 default:
120 case message::Table::Field::VARCHAR:123 case message::Table::Field::VARCHAR:
121 push(VARCHAR);124 push(collation.compare("binary") ? VARCHAR : VARBIN);
122 break;125 break;
123 case message::Table::Field::DOUBLE:126 case message::Table::Field::DOUBLE:
124 push(DOUBLE);127 push(DOUBLE);
125 break;128 break;
126 case message::Table::Field::BLOB:129 case message::Table::Field::BLOB:
127 push(BLOB);130 push(collation.compare("binary") ? TEXT : BLOB);
128 break;131 break;
129 case message::Table::Field::ENUM:132 case message::Table::Field::ENUM:
130 push(ENUM);133 push(ENUM);
@@ -157,7 +160,7 @@
157 push(column.name());160 push(column.name());
158161
159 /* Type */162 /* Type */
160 pushType(column.type());163 pushType(column.type(), column.string_options().collation());
161164
162 /* Null */165 /* Null */
163 push(column.constraints().is_nullable());166 push(column.constraints().is_nullable());
164167
=== modified file 'plugin/show_dictionary/show_columns.h'
--- plugin/show_dictionary/show_columns.h 2010-03-31 23:39:12 +0000
+++ plugin/show_dictionary/show_columns.h 2010-09-10 22:17:06 +0000
@@ -55,7 +55,7 @@
55 return table_name;55 return table_name;
56 }56 }
5757
58 void pushType(drizzled::message::Table::Field::FieldType type);58 void pushType(drizzled::message::Table::Field::FieldType type, const std::string collation);
5959
60 void fill();60 void fill();
6161
6262
=== modified file 'tests/r/type_blob.result'
--- tests/r/type_blob.result 2010-09-02 18:35:05 +0000
+++ tests/r/type_blob.result 2010-09-10 22:17:06 +0000
@@ -3,10 +3,10 @@
3show columns from t1;3show columns from t1;
4Field Type Null Default Default_is_NULL On_Update4Field Type Null Default Default_is_NULL On_Update
5a BLOB YES YES 5a BLOB YES YES
6b BLOB YES YES 6b TEXT YES YES
7c BLOB YES YES 7c BLOB YES YES
8d BLOB YES YES 8d TEXT YES YES
9e BLOB YES YES 9e TEXT YES YES
10CREATE TABLE t2 (a varchar(255), b blob, c blob);10CREATE TABLE t2 (a varchar(255), b blob, c blob);
11CREATE TABLE t4 (c varchar(16383) not null);11CREATE TABLE t4 (c varchar(16383) not null);
12show columns from t2;12show columns from t2;
1313
=== modified file 'tests/r/type_datetime.result'
--- tests/r/type_datetime.result 2010-09-02 18:35:05 +0000
+++ tests/r/type_datetime.result 2010-09-10 22:17:06 +0000
@@ -354,11 +354,11 @@
354create table t5 as select coalesce(f1,f3) as f4 from t1;354create table t5 as select coalesce(f1,f3) as f4 from t1;
355desc t5;355desc t5;
356Field Type Null Default Default_is_NULL On_Update356Field Type Null Default Default_is_NULL On_Update
357f4 VARCHAR YES YES 357f4 VARBINARY YES YES
358create table t6 as select coalesce(f2,f3) as f4 from t1;358create table t6 as select coalesce(f2,f3) as f4 from t1;
359desc t6;359desc t6;
360Field Type Null Default Default_is_NULL On_Update360Field Type Null Default Default_is_NULL On_Update
361f4 VARCHAR YES YES 361f4 VARBINARY YES YES
362create table t7 as select coalesce(makedate(1997,1),f2) as f4 from t1;362create table t7 as select coalesce(makedate(1997,1),f2) as f4 from t1;
363desc t7;363desc t7;
364Field Type Null Default Default_is_NULL On_Update364Field Type Null Default Default_is_NULL On_Update
365365
=== modified file 'tests/r/type_ranges.result'
--- tests/r/type_ranges.result 2010-08-10 22:19:02 +0000
+++ tests/r/type_ranges.result 2010-09-10 22:17:06 +0000
@@ -190,11 +190,11 @@
190t1 INTEGER NO NO 190t1 INTEGER NO NO
191t2 VARCHAR NO NO 191t2 VARCHAR NO NO
192t3 VARCHAR YES YES 192t3 VARCHAR YES YES
193t4 VARCHAR YES YES 193t4 VARBINARY YES YES
194t5 BLOB YES YES 194t5 TEXT YES YES
195t6 BLOB YES YES 195t6 BLOB YES YES
196t7 VARCHAR NO NO 196t7 VARCHAR NO NO
197t8 VARCHAR YES YES 197t8 VARBINARY YES YES
198select t1,t2,length(t3),length(t4),length(t5),length(t6),t7,t8 from t2;198select t1,t2,length(t3),length(t4),length(t5),length(t6),t7,t8 from t2;
199t1 t2 length(t3) length(t4) length(t5) length(t6) t7 t8199t1 t2 length(t3) length(t4) length(t5) length(t6) t7 t8
2001 a 256 256 4096 4096 2001 a 256 256 4096 4096
201201
=== modified file 'tests/r/union.result'
--- tests/r/union.result 2010-09-02 18:35:05 +0000
+++ tests/r/union.result 2010-09-10 22:17:06 +0000
@@ -1441,11 +1441,11 @@
1441CREATE TABLE t4 SELECT NULL;1441CREATE TABLE t4 SELECT NULL;
1442DESC t4;1442DESC t4;
1443Field Type Null Default Default_is_NULL On_Update1443Field Type Null Default Default_is_NULL On_Update
1444NULL VARCHAR YES YES 1444NULL VARBINARY YES YES
1445CREATE TABLE t5 SELECT NULL UNION SELECT NULL;1445CREATE TABLE t5 SELECT NULL UNION SELECT NULL;
1446DESC t5;1446DESC t5;
1447Field Type Null Default Default_is_NULL On_Update1447Field Type Null Default Default_is_NULL On_Update
1448NULL VARCHAR YES YES 1448NULL VARBINARY YES YES
1449CREATE TABLE t6 1449CREATE TABLE t6
1450SELECT * FROM (SELECT * FROM (SELECT NULL)a) b UNION SELECT a FROM t1;1450SELECT * FROM (SELECT * FROM (SELECT NULL)a) b UNION SELECT a FROM t1;
1451DESC t6;1451DESC t6;