diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-23 17:37:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-23 17:37:52 +0300 |
| commit | 3c92050d1c907cc548e848d0ab2891a06681ad92 (patch) | |
| tree | 27ea08091389453521b52f15c6dffe3d70ecb68b /sql/sql_table.cc | |
| parent | 13eae1885e739a234cebd592f891e87f387784c6 (diff) | |
| download | mariadb-git-3c92050d1c907cc548e848d0ab2891a06681ad92.tar.gz | |
Fix build without either ENABLED_DEBUG_SYNC or DBUG_OFF
There are separate flags DBUG_OFF for disabling the DBUG facility
and ENABLED_DEBUG_SYNC for enabling the DEBUG_SYNC facility.
Let us allow debug builds without DEBUG_SYNC.
Note: For CMAKE_BUILD_TYPE=Debug, CMakeLists.txt will continue to
define ENABLED_DEBUG_SYNC.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index a5fa36ffde6..f29fecd2744 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2115,10 +2115,12 @@ bool mysql_rm_table(THD *thd,TABLE_LIST *tables, bool if_exists, } } +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("ib_purge_virtual_mdev_16222_1", DBUG_ASSERT(!debug_sync_set_action( thd, STRING_WITH_LEN("now SIGNAL drop_started")));); +#endif /* mark for close and remove all cached entries */ thd->push_internal_handler(&err_handler); @@ -9654,7 +9656,7 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db, DEBUG_SYNC(thd, "alter_opened_table"); -#ifdef WITH_WSREP +#if defined WITH_WSREP && defined ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("sync.alter_opened_table", { const char act[]= |