diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 13:27:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 13:27:18 +0300 |
| commit | 46957a6a77518b579c6c8e1345666f84a5a59455 (patch) | |
| tree | c0e463f14123cd09bb4d5854d32577e44b3a9827 /sql/sql_yacc_ora.yy | |
| parent | 1619ae899099c4934f3b5919b2398c95a7cacc94 (diff) | |
| parent | e3d692aa092a76415ce1ce0e9662338873d84abb (diff) | |
| download | mariadb-git-46957a6a77518b579c6c8e1345666f84a5a59455.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_yacc_ora.yy')
| -rw-r--r-- | sql/sql_yacc_ora.yy | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index c8084f8109c..02fa9c81f88 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2010, 2019, MariaDB Corporation. + Copyright (c) 2010, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -8576,6 +8576,8 @@ alter_list_item: } | ALTER opt_column opt_if_exists_table_element field_ident SET DEFAULT column_default_expr { + if (check_expression($7, &$4, VCOL_DEFAULT)) + MYSQL_YYABORT; if (unlikely(Lex->add_alter_list($4.str, $7, $3))) MYSQL_YYABORT; } |