bzr commit into mysql-5.1 branch (sandeep.doddaballapur:3557)

[Sandeep Doddaballapur]

#At file:///home/sandeep/Desktop/work/mysql-5.1/ based on revid:alexander.barkov@stripped

 3557 Sandeep Doddaballapur	2011-01-17
      (no message)

    modified:
      mysql-test/r/csv_not_null.result
      mysql-test/t/csv_not_null.test
=== modified file 'mysql-test/r/csv_not_null.result'
--- a/mysql-test/r/csv_not_null.result	2009-02-05 09:49:32 +0000
+++ b/mysql-test/r/csv_not_null.result	2011-01-17 11:03:54 +0000
@@ -19,13 +19,16 @@ INSERT INTO t1 VALUES();
 SELECT * FROM t1;
 a	b	c	d	e	f
 0				foo	0000-00-00
+INSERT INTO t1 VALUES(default,default,default,default,default,default);
 SELECT * FROM t1;
 a	b	c	d	e	f
 0				foo	0000-00-00
+0				foo	0000-00-00
 INSERT INTO t1 VALUES(0,'abc','def','ghi','bar','1999-12-31');
 SELECT * FROM t1;
 a	b	c	d	e	f
 0				foo	0000-00-00
+0				foo	0000-00-00
 0	abc	def	ghi	bar	1999-12-31
 # === insert failures ===
 INSERT INTO t1 VALUES(NULL,'ab','a','b','foo','2007-01-01');

=== modified file 'mysql-test/t/csv_not_null.test'
--- a/mysql-test/t/csv_not_null.test	2009-02-05 09:49:32 +0000
+++ b/mysql-test/t/csv_not_null.test	2011-01-17 11:03:54 +0000
@@ -7,7 +7,6 @@
 #           CREATE, INSERT, and UPDATE statements 
 #           ALTER statements in separate file due to BUG#33696 
 # Author pcrews
-# Last modified:  2008-01-04
 #-----------------------------------------------------------------------------
 
 --source include/have_csv.inc
@@ -55,10 +54,8 @@ INSERT INTO t1 VALUES();
 SELECT * FROM t1;
 
 -- disable_warnings
-# NOTE - Test disabled due to enum crash for this INSERT
-# See Bug#33717 - INSERT...(default) fails for enum. 
-# Crashes CSV tables, loads spaces for MyISAM
-#INSERT INTO t1 VALUES(default,default,default,default,default,default);
+# Bug#33717 - INSERT...(default) fails for enum. 
+INSERT INTO t1 VALUES(default,default,default,default,default,default);
 -- enable_warnings
 
 SELECT * FROM t1;


Attachment: [text/bzr-bundle]