From: Date: December 6 2007 2:40pm
Subject: bk commit into 5.1 tree (svoj:1.2677) BUG#32817
List-Archive: http://lists.mysql.com/commits/39409
X-Bug: 32817
Message-Id: <20071206134044.E729C41CEC9@june.myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-06 17:40:40+04:00, svoj@stripped +3 -0
  BUG#32817 - though CSV is marked as supported create table is rejected
              with error 1005.
  
  CSV doesn't support nullable fields. Report descriptive error if create
  table with nullable field is requested.

  mysql-test/r/csv.result@stripped, 2007-12-06 17:40:38+04:00, svoj@stripped +8 -2
    A test case for BUG#32817.

  mysql-test/t/csv.test@stripped, 2007-12-06 17:40:38+04:00, svoj@stripped +9 -2
    A test case for BUG#32817.

  storage/csv/ha_tina.cc@stripped, 2007-12-06 17:40:38+04:00, svoj@stripped +4 -1
    CSV doesn't support nullable fields. Report descriptive error if create
    table with nullable field is requested.

diff -Nrup a/mysql-test/r/csv.result b/mysql-test/r/csv.result
--- a/mysql-test/r/csv.result	2007-10-26 05:25:14 +05:00
+++ b/mysql-test/r/csv.result	2007-12-06 17:40:38 +04:00
@@ -5364,13 +5364,19 @@ BIN(a)
 0
 drop table t1;
 create table t1(a enum('foo','bar') default null) engine=csv;
-ERROR HY000: Can't create table 'test.t1' (errno: -1)
+ERROR 42000: The storage engine for the table doesn't support nullable columns
 create table t1(a enum('foo','bar') default 'foo') engine=csv;
-ERROR HY000: Can't create table 'test.t1' (errno: -1)
+ERROR 42000: The storage engine for the table doesn't support nullable columns
 create table t1(a enum('foo','bar') default 'foo' not null) engine=csv;
 insert into t1 values();
 select * from t1;
 a
 foo
 drop table t1;
+CREATE TABLE t1(a INT) ENGINE=CSV;
+ERROR 42000: The storage engine for the table doesn't support nullable columns
+SHOW WARNINGS;
+Level	Code	Message
+Error	1178	The storage engine for the table doesn't support nullable columns
+Error	1005	Can't create table 'test.t1' (errno: 138)
 End of 5.1 tests
diff -Nrup a/mysql-test/t/csv.test b/mysql-test/t/csv.test
--- a/mysql-test/t/csv.test	2007-10-26 05:25:33 +05:00
+++ b/mysql-test/t/csv.test	2007-12-06 17:40:38 +04:00
@@ -1755,9 +1755,9 @@ insert into t1 values();
 select BIN(a) from t1;
 drop table t1;
 # We prevent creation of table with nullable ENUM
---error ER_CANT_CREATE_TABLE
+--error 1178
 create table t1(a enum('foo','bar') default null) engine=csv;
---error ER_CANT_CREATE_TABLE
+--error 1178
 create table t1(a enum('foo','bar') default 'foo') engine=csv;
 # Enum columns must be specified as NOT NULL
 create table t1(a enum('foo','bar') default 'foo' not null) engine=csv;
@@ -1765,5 +1765,12 @@ insert into t1 values();
 select * from t1;
 drop table t1;
 
+#
+# BUG#32817 - though CSV is marked as supported create table is rejected
+#             with error 1005.
+#
+--error 1178
+CREATE TABLE t1(a INT) ENGINE=CSV;
+SHOW WARNINGS;
 
 --echo End of 5.1 tests
diff -Nrup a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
--- a/storage/csv/ha_tina.cc	2007-11-27 14:01:02 +04:00
+++ b/storage/csv/ha_tina.cc	2007-12-06 17:40:38 +04:00
@@ -1486,7 +1486,10 @@ int ha_tina::create(const char *name, TA
   for (Field **field= table_arg->s->field; *field; field++)
   {
     if ((*field)->real_maybe_null())
-      DBUG_RETURN(-1);
+    {
+      my_error(ER_CHECK_NOT_IMPLEMENTED, MYF(0), "nullable columns");
+      DBUG_RETURN(HA_ERR_UNSUPPORTED);
+    }
   }