bzr commit into mysql-6.0-bugteam branch (patrick.crews:2754) Bug#33970

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/csv/mysql-6.0-bugteam/

 2754 Patrick Crews	2008-11-26 [merge]
      Bug#33970 merge 5.1 -> 6.0
removed:
  mysql-test/r/csv_alter_table.result
added:
  mysql-test/r/csv_alter_table.result

=== 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-17 20:25:27 +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;

=== removed file 'mysql-test/r/csv_alter_table.result'
--- a/mysql-test/r/csv_alter_table.result	2008-11-26 08:30:09 +0000
+++ b/mysql-test/r/csv_alter_table.result	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-# ===== 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;