summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2016-06-30 00:16:10 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-30 11:43:02 +0200
commit6c173324ffa0c6d5a6997610ee4e6cc73bd9ae9e (patch)
tree59c88af635603d4369e5938157508b724dd0719c /sql/sql_show.cc
parent3aadba15574c2c238671f4ecaa74f330dca4d17d (diff)
downloadmariadb-git-6c173324ffa0c6d5a6997610ee4e6cc73bd9ae9e.tar.gz
Part of MDEV-10134 Add full support for DEFAULT
Print default values for BLOB's. This is a part commit for automatic changes to make the real commit smaller. All changes here are related to that we now print DEFAULT NULL for blob and text fields, like we do for all other fields.
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index ba9977f65b1..26b20bee530 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1625,8 +1625,7 @@ static bool get_field_default_value(THD *thd, Field *field, String *def_value,
*/
has_now_default= field->has_insert_default_function();
- has_default= (field_type != FIELD_TYPE_BLOB &&
- !(field->flags & NO_DEFAULT_VALUE_FLAG) &&
+ has_default= (!(field->flags & NO_DEFAULT_VALUE_FLAG) &&
field->unireg_check != Field::NEXT_NUMBER &&
!((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40))
&& has_now_default));