diff options
| author | unknown <jimw@mysql.com> | 2005-11-30 12:17:01 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-30 12:17:01 -0800 |
| commit | 6653213a71b2df0540c97dddcc3d7ee9e710be90 (patch) | |
| tree | 0842357ad78347a6ab54d08343e906c55f7b72b0 /mysql-test/r/alter_table.result | |
| parent | fc289724bba5f689dbe46666a70866ee0d297777 (diff) | |
| parent | 03e057cd9ec2feb08f00578a9f22801f8656d92d (diff) | |
| download | mariadb-git-6653213a71b2df0540c97dddcc3d7ee9e710be90.tar.gz | |
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
Diffstat (limited to 'mysql-test/r/alter_table.result')
| -rw-r--r-- | mysql-test/r/alter_table.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index e3e9dab78bd..85d3bd0b2ad 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -555,6 +555,11 @@ alter table test.t1 rename t1; ERROR 3D000: No database selected alter table test.t1 rename test.t1; use test; +create table t1 (mycol int(10) not null); +alter table t1 alter column mycol set default 0; +desc t1; +Field Type Null Key Default Extra +mycol int(10) NO 0 drop table t1; create table t1 (v varchar(32)); insert into t1 values ('def'),('abc'),('hij'),('3r4f'); |