summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-03-29 10:58:20 +0100
committerSergei Golubchik <serg@mariadb.org>2019-03-29 10:58:20 +0100
commitf2a0c758da3d9f0fa42c96114b453cf4835bcbab (patch)
treed51cdc29774cfc04f522e2253542d73c94a9728b /sql/sql_table.cc
parentfc168c3a5e58d8b364a2e87e0d876a261ec7fced (diff)
parentd0116e10a5da52503a89a413e481996ce3f65e63 (diff)
downloadmariadb-git-f2a0c758da3d9f0fa42c96114b453cf4835bcbab.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index b559e36315b..071f4763b34 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -7873,11 +7873,6 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
}
if (alter)
{
- if (def->sql_type == MYSQL_TYPE_BLOB)
- {
- my_error(ER_BLOB_CANT_HAVE_DEFAULT, MYF(0), def->change);
- goto err;
- }
if ((def->default_value= alter->default_value)) // Use new default
def->flags&= ~NO_DEFAULT_VALUE_FLAG;
else