bzr commit into mysql-5.1 branch (tomas.ulin:2787) Bug#33696

[Tomas Ulin]

#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.2-merge/

 2787 Tomas Ulin	2009-01-08
      Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
modified:
  storage/csv/ha_tina.cc

=== modified file 'storage/csv/ha_tina.cc'
--- a/storage/csv/ha_tina.cc	2008-08-15 06:53:54 +0000
+++ b/storage/csv/ha_tina.cc	2009-01-08 14:03:53 +0000
@@ -1591,10 +1591,21 @@ int ha_tina::check(THD* thd, HA_CHECK_OP
 }
 
 
+/**
+   Return the compatiblity of alter table changes, created for new 
+   fast on-line alter table operation.
+   @param    info                Information about  new altered table properties
+   @param    table_changes       Information if the table layout is changed
+   @retval   COMPATIBLE_DATA_NO  Altered table changes made are incompatible
+   @retval   COMPATIBLE_DATA_YES Altered table changes made are compatible
+*/
 bool ha_tina::check_if_incompatible_data(HA_CREATE_INFO *info,
 					   uint table_changes)
 {
-  return COMPATIBLE_DATA_YES;
+  if (table_changes == IS_EQUAL_NO)
+    return COMPATIBLE_DATA_NO;
+  else
+    return COMPATIBLE_DATA_YES;
 }
 
 struct st_mysql_storage_engine csv_storage_engine=