diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
| commit | a15234bf4bf98d7833996284c033fc53a981f5d4 (patch) | |
| tree | d989b448854f9d59de5ca16b962414591c8a5b2e /sql/sql_update.cc | |
| parent | 9a6212008999da44b136605c1abf2cc9c7cc4b2c (diff) | |
| parent | e5e5877740f248de848219ee3a1d2881cd5c5b82 (diff) | |
| download | mariadb-git-a15234bf4bf98d7833996284c033fc53a981f5d4.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 8ecac25e162..af09675d917 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1387,7 +1387,7 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list, DBUG_ASSERT(table_list->table); // conds could be cached from previous SP call - DBUG_ASSERT(!table_list->vers_conditions.is_set() || + DBUG_ASSERT(!table_list->vers_conditions.need_setup() || !*conds || thd->stmt_arena->is_stmt_execute()); if (select_lex->vers_setup_conds(thd, table_list)) DBUG_RETURN(TRUE); |