INSERT ... VALUES(DEFAULT)

BitKeeper/deleted/.del-insert_set.test~35be5a761a410ac1:
  Delete: mysql-test/t/insert_set.test
BitKeeper/deleted/.del-insert_set.result~fca5025db098c892:
  Delete: mysql-test/r/insert_set.result
Docs/manual.texi:
  Changelog
mysql-test/r/insert.result:
  Test new insert ... (DEFAULT)
mysql-test/t/insert.test:
  Test new insert ... (DEFAULT)
sql/item.cc:
  Indentation cleanup

4 files changed, 52 insertions, 16 deletions

diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
index f57efa33020..a1eff07f4d5 100644
--- a/mysql-test/r/insert.result
+++ b/mysql-test/r/insert.result
@@ -19,3 +19,29 @@ insert into t1 values (0,"mysql a");
 insert into t1 values (0,"r1manic");
 insert into t1 values (0,"r1man");
 drop table t1;
+create table t1 (a int not null auto_increment, primary key (a), t timestamp, c char(10) default "hello");
+insert into t1 values (default,default,default), (default,default,default), (4,0,"a"),(default,default,default);
+select a,t>0,c from t1;
+a	t>0	c
+1	1	hello
+2	1	hello
+4	0	a
+5	1	hello
+truncate table t1;
+insert into t1 set a=default,t=default,c=default;
+insert into t1 set a=default,t=default,c=default;
+insert into t1 set a=4,t=0,c="a";
+insert into t1 set a=default,t=default,c=default;
+select a,t>0,c from t1;
+a	t>0	c
+1	1	hello
+2	1	hello
+4	0	a
+5	1	hello
+drop table t1;
+drop database if exists foo;
+create database foo;
+use foo;
+create table t1 (c int);
+insert into foo.t1 set foo.t1.c = '1';
+drop database foo;
diff --git a/mysql-test/r/insert_set.result b/mysql-test/r/insert_set.result
deleted file mode 100644
index d95765c6472..00000000000
--- a/mysql-test/r/insert_set.result
+++ /dev/null
@@ -1,6 +0,0 @@
-drop database if exists foo;
-create database foo;
-use foo;
-create table b (c int);
-insert into foo.b set foo.b.c = '1';
-drop database foo;
diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
index 270b1cd4c79..85798ec57f6 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -22,3 +22,29 @@ insert into t1 values (0,"mysql a");
 insert into t1 values (0,"r1manic");
 insert into t1 values (0,"r1man");
 drop table t1;
+
+#
+# Test insert syntax
+#
+
+create table t1 (a int not null auto_increment, primary key (a), t timestamp, c char(10) default "hello");
+insert into t1 values (default,default,default), (default,default,default), (4,0,"a"),(default,default,default);
+select a,t>0,c from t1;
+truncate table t1;
+insert into t1 set a=default,t=default,c=default;
+insert into t1 set a=default,t=default,c=default;
+insert into t1 set a=4,t=0,c="a";
+insert into t1 set a=default,t=default,c=default;
+select a,t>0,c from t1;
+drop table t1;
+
+#
+# Test of mysqld crash with fully qualified column names
+#
+
+drop database if exists foo;
+create database foo;
+use foo;
+create table t1 (c int);
+insert into foo.t1 set foo.t1.c = '1';
+drop database foo;
diff --git a/mysql-test/t/insert_set.test b/mysql-test/t/insert_set.test
deleted file mode 100644
index 2f7e8408ea3..00000000000
--- a/mysql-test/t/insert_set.test
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Test of mysqld crash with fully qualified column names
-#
-
-drop database if exists foo;
-create database foo;
-use foo;
-create table b (c int);
-insert into foo.b set foo.b.c = '1';
-drop database foo;