bzr push into mysql-6.0-backup branch (satya.bn:2746 to 2747) Bug#33696

[Satya B]

 2747 Satya B	2008-11-26
      Bug#33696 - CSV storage engine allows nullable columns via ALTER TABLE statements
      
      Adding the result file for csv_alter_table.test
added:
  mysql-test/r/csv_alter_table.result

 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

=== added file 'mysql-test/r/csv_alter_table.result'
--- a/mysql-test/r/csv_alter_table.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/csv_alter_table.result	2008-11-26 08:30:09 +0000
@@ -0,0 +1,40 @@
+# ===== csv_alter_table.1 =====
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a int NOT NULL) ENGINE = CSV;
+ALTER TABLE t1 ADD COLUMN b CHAR(5) NOT NULL;
+DESC t1;
+Field	Type	Null	Key	Default	Extra
+a	int(11)	NO		NULL	
+b	char(5)	NO		NULL	
+ALTER TABLE t1 DROP COLUMN b;
+DESC t1;
+Field	Type	Null	Key	Default	Extra
+a	int(11)	NO		NULL	
+ALTER TABLE t1 MODIFY a BIGINT NOT NULL;
+DESC t1;
+Field	Type	Null	Key	Default	Extra
+a	bigint(20)	NO		NULL	
+ALTER TABLE t1 CHANGE a a INT NOT NULL;
+DESC t1;
+Field	Type	Null	Key	Default	Extra
+a	int(11)	NO		NULL	
+DROP TABLE t1;
+# ===== csv_alter_table.2 =====
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a int NOT NULL) ENGINE = CSV;
+ALTER TABLE t1 ADD COLUMN b CHAR(5);
+ERROR 42000: The storage engine for the table doesn't support nullable columns
+DESC t1;
+Field	Type	Null	Key	Default	Extra
+a	int(11)	NO		NULL	
+ALTER TABLE t1 MODIFY a BIGINT;
+ERROR 42000: The storage engine for the table doesn't support nullable columns
+DESC t1;
+Field	Type	Null	Key	Default	Extra
+a	int(11)	NO		NULL	
+ALTER TABLE t1 CHANGE a a INT;
+ERROR 42000: The storage engine for the table doesn't support nullable columns
+DESC t1;
+Field	Type	Null	Key	Default	Extra
+a	int(11)	NO		NULL	
+DROP TABLE t1;