diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-17 20:07:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-17 20:07:38 +0300 |
| commit | ae8c8d8874302a86de67f47ed70486e73204504f (patch) | |
| tree | 965336b5dda53eea1ae685d2b912169ae989c9af /sql/sql_truncate.cc | |
| parent | 1e9c922fa726b22f4522f2a4de0fcb6595404086 (diff) | |
| parent | 699de65d5e1cda0b8c6a994f8513e97804b1a7ad (diff) | |
| download | mariadb-git-ae8c8d8874302a86de67f47ed70486e73204504f.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_truncate.cc')
| -rw-r--r-- | sql/sql_truncate.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index 1613c5a6586..c6af72c5979 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -467,15 +467,13 @@ bool Sql_cmd_truncate_table::truncate_table(THD *thd, TABLE_LIST *table_ref) { if (keys.empty()) { - WSREP_TO_ISOLATION_BEGIN_IF(table_ref->db.str, table_ref->table_name.str, NULL) - { + if (wsrep_to_isolation_begin(thd, table_ref->db.str, table_ref->table_name.str, NULL)) DBUG_RETURN(TRUE); - } - } else { - WSREP_TO_ISOLATION_BEGIN_FK_TABLES(NULL, NULL, table_ref, &keys) - { + } + else + { + if (wsrep_to_isolation_begin(thd, NULL, NULL, table_ref, NULL, &keys)) DBUG_RETURN(TRUE); - } } } } |