Merge lp:~stewart/drizzle/bug673380 into lp:drizzle/7.0

[Stewart Smith]

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/599/

found when I found the innobase fix for this.

=== modified file 'drizzled/table_proto_write.cc'
--- drizzled/table_proto_write.cc	2010-10-07 05:18:53 +0000
+++ drizzled/table_proto_write.cc	2010-11-10 08:49:46 +0000
@@ -96,6 +96,12 @@
 
     message::Table::Field::FieldType parser_type= attribute->type();
 
+    if (field_arg->sql_type == DRIZZLE_TYPE_NULL)
+    {
+      my_error(ER_CANT_CREATE_TABLE, MYF(ME_BELL+ME_WAITTANG), table_proto.name().c_str(), -1);
+      return -1;
+    }
+
     attribute->set_type(message::internalFieldTypeToFieldProtoType(field_arg->sql_type));
 
     switch (attribute->type()) {

=== added file 'tests/r/bug673380_create_table_null_col_type.result'
--- tests/r/bug673380_create_table_null_col_type.result	1970-01-01 00:00:00 +0000
+++ tests/r/bug673380_create_table_null_col_type.result	2010-11-10 08:49:46 +0000
@@ -0,0 +1,3 @@
+CREATE TEMPORARY TABLE TABLE_54044
+AS SELECT IF(NULL  IS NOT NULL, NULL, NULL);
+ERROR HY000: Can't create table 'table_54044' (errno: -1)

=== added file 'tests/t/bug673380_create_table_null_col_type.test'
--- tests/t/bug673380_create_table_null_col_type.test	1970-01-01 00:00:00 +0000
+++ tests/t/bug673380_create_table_null_col_type.test	2010-11-10 08:49:46 +0000
@@ -0,0 +1,10 @@
+# This is the test for bug #54044. Special handle MYSQL_TYPE_NULL type
+# during create table, so it will not trigger assertion failure.
+
+# This 'create table' operation should fail because of
+# using NULL datatype
+--error ER_CANT_CREATE_TABLE
+CREATE TEMPORARY TABLE TABLE_54044
+ AS SELECT IF(NULL  IS NOT NULL, NULL, NULL); 
+
+