database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.0

Browse Source 
into mysql.com:/home/hf/work/mysql-5.0.14693
This commit is contained in:
holyfoot@mysql.com
2005-11-29 13:33:56 +04:00
parent 0f73558ee3 e906120ba8
commit c60b8e3027
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/alter_table.result
View File

@ -556,3 +556,9 @@ ERROR 3D000: No database selected
alter table test.t1 rename test.t1; alter table test.t1 rename test.t1;
use test; use test;
drop table t1; drop table t1;
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;

9
mysql-test/t/alter_table.test
View File

@ -401,3 +401,12 @@ use test;
drop table t1; drop table t1;
# End of 4.1 tests # End of 4.1 tests
#
# 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 t1;

5
sql/sql_table.cc
View File

@ -3400,7 +3400,10 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
my_error(ER_BLOB_CANT_HAVE_DEFAULT, MYF(0), def->change); my_error(ER_BLOB_CANT_HAVE_DEFAULT, MYF(0), def->change);
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
def->def=alter->def; // Use new default if ((def->def=alter->def)) // Use new default
def->flags&= ~NO_DEFAULT_VALUE_FLAG;
else
def->flags|= NO_DEFAULT_VALUE_FLAG;
alter_it.remove(); alter_it.remove();
} }
} }