diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 17:44:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 17:44:22 +0100 |
| commit | 00a313ecf329098d4b31a42030b9b5c6f80a6031 (patch) | |
| tree | f4983a6629b04563c48fa7276686dfc2187efb5f /sql/sql_plugin.h | |
| parent | ef5adf520760536c7396bdfe884fc509ac065694 (diff) | |
| parent | 691f93d6d17603f11a0c90f64e94b7ce9d187db4 (diff) | |
| download | mariadb-git-00a313ecf329098d4b31a42030b9b5c6f80a6031.tar.gz | |
Merge branch 'bb-10.3-release' into bb-10.4-release
Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution"
was null-merged. 10.4 version of the fix is coming up separately
Diffstat (limited to 'sql/sql_plugin.h')
| -rw-r--r-- | sql/sql_plugin.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h index c9c75d07a6e..eb5532f5d59 100644 --- a/sql/sql_plugin.h +++ b/sql/sql_plugin.h @@ -22,10 +22,11 @@ that is defined in plugin.h */ #define SHOW_always_last SHOW_KEY_CACHE_LONG, \ - SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, \ SHOW_HAVE, SHOW_MY_BOOL, SHOW_HA_ROWS, SHOW_SYS, \ - SHOW_LONG_NOFLUSH, SHOW_LONGLONG_STATUS, SHOW_UINT32_STATUS, \ - SHOW_LEX_STRING, SHOW_ATOMIC_COUNTER_UINT32_T + SHOW_LONG_NOFLUSH, SHOW_LEX_STRING, SHOW_ATOMIC_COUNTER_UINT32_T, \ + /* SHOW_*_STATUS must be at the end, SHOW_LONG_STATUS being first */ \ + SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_LONGLONG_STATUS, \ + SHOW_UINT32_STATUS #include "mariadb.h" #undef SHOW_always_last @@ -204,4 +205,3 @@ extern void sync_dynamic_session_variables(THD* thd, bool global_lock); extern void wsrep_plugins_pre_init(); extern void wsrep_plugins_post_init(); #endif /* WITH_WSREP */ - |