diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-08 23:47:20 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-08 23:47:20 +0400 |
| commit | ec8c38a82ec1bb00f681a3f6662bd5c76ebb7c75 (patch) | |
| tree | b3a7cc7930787be4474ac8abf1663ae92abacba3 /sql/sql_base.cc | |
| parent | 47b7ffb396bd283bd4196194311ba39ed9692421 (diff) | |
| parent | 5da6bd7b959af4a9755556afedde8f34d95c679a (diff) | |
| download | mariadb-git-ec8c38a82ec1bb00f681a3f6662bd5c76ebb7c75.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 99c67186dbd..4f87d498300 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4823,9 +4823,9 @@ static bool fix_all_session_vcol_exprs(THD *thd, TABLE_LIST *tables) fix_session_vcol_expr(thd, (*df)->default_value)) goto err; - for (Virtual_column_info **cc= t->check_constraints; cc && *cc; cc++) - if (fix_session_vcol_expr(thd, (*cc))) - goto err; + for (Virtual_column_info **cc= t->check_constraints; cc && *cc; cc++) + if (fix_session_vcol_expr(thd, (*cc))) + goto err; thd->security_ctx= save_security_ctx; } |