diff options
| author | holyfoot@mysql.com <> | 2005-11-29 13:33:56 +0400 |
|---|---|---|
| committer | holyfoot@mysql.com <> | 2005-11-29 13:33:56 +0400 |
| commit | c60b8e3027d29e01cfb0b7f0c6dff90c8186ccf8 (patch) | |
| tree | 27ffc4e75bf5306d6a8937bb0fef45fef27e556f /sql/sql_table.cc | |
| parent | 0f73558ee3d8ca74af60b0a4d1de788ac84721ea (diff) | |
| parent | e906120ba8b4f683c5a145506d92ff445ba938a9 (diff) | |
| download | mariadb-git-c60b8e3027d29e01cfb0b7f0c6dff90c8186ccf8.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.14693
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 949417dfa30..ae7e618f5df 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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); 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(); } } |