bzr push into mysql-6.0-backup branch (satya.bn:2746)

[Satya B]

 2746 Satya B	2008-11-26 [merge]
      Merging with mysql-6.0-bugteam
added:
  mysql-test/r/multi_update2.result
  mysql-test/t/multi_update2-master.opt
  mysql-test/t/multi_update2.test
modified:
  .bzrignore
  mysql-test/r/events_scheduling.result
  mysql-test/r/events_time_zone.result
  mysql-test/r/group_concat_max_len_func.result
  mysql-test/r/multi_update.result
  mysql-test/r/variables-notembedded.result
  mysql-test/r/variables.result
  mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc
  mysql-test/t/events_scheduling.test
  mysql-test/t/events_time_zone.test
  mysql-test/t/group_concat_max_len_func.test
  mysql-test/t/multi_update.test
  mysql-test/t/variables-notembedded.test
  mysql-test/t/variables.test
  sql/item_func.cc
  sql/set_var.cc
  sql/set_var.h
  sql/slave.cc
  sql/slave.h
  sql/sql_repl.cc

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2008-11-24 17:45:21 +0000
+++ b/mysql-test/t/disabled.def	2008-11-26 06:22:31 +0000
@@ -15,7 +15,6 @@ lowercase_table3         : Bug#32667 low
 rpl_log_pos          : Bug#8693 Test 'rpl_log_pos' fails sometimes
 ctype_create         : Bug#32965 main.ctype_create fails
 backup_no_engine     : Bug#36021 2008-04-13 rsomla server crashes when openning table with unknown storage engine
-csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
 query_cache_wlock_invalidate_func: Bug#35390 causes not deterministic results.
 cast                 : Bug#35594 2008-03-27 main.cast fails on Windows2003-64
 timestamp_func              : Bug #37702 timestamp_func relies on sleep and is unstable in pushbuild

=== modified file 'storage/csv/ha_tina.cc'
--- a/storage/csv/ha_tina.cc	2008-10-28 14:17:05 +0000
+++ b/storage/csv/ha_tina.cc	2008-11-24 15:20:28 +0000
@@ -1607,10 +1607,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=