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 /sql/sql_table.cc | |
| 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 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index b9a52f19c15..ff562cf2a39 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4153,7 +4153,10 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, my_error(ER_BLOB_CANT_HAVE_DEFAULT, MYF(0), def->change); 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(); } } |