Merge mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.1-clean


VC++Files/sql/mysqld.dsp:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/alter_table.result:
  Resolve conflict
mysql-test/t/alter_table.test:
  Resolve conflict

1 files changed, 11 insertions, 3 deletions

diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index 6a9e482a12b..e31cdc8a869 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -405,9 +405,17 @@ drop table t1;
 # End of 4.1 tests
 
 #
-# Some additional tests for new, faster alter table.
-# Note that most of the whole alter table code is being
-# tested all around the test suite already.
+# Bug #14693 (ALTER SET DEFAULT doesn't work)
+#
+
+create table t1 (mycol int(10) not null);
+alter table t1 alter column mycol set default 0;
+desc t1;
+drop table;
+
+#
+# Some additional tests for new, faster alter table.  Note that most of the
+# whole alter table code is being tested all around the test suite already.
 #
 
 create table t1 (v varchar(32));