diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
| commit | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (patch) | |
| tree | b7447115f45de0f03bbe18c26fc0866367483066 /include/my_sys.h | |
| parent | db9e41ddc31f2e705a54132cf69c781e1cc60f07 (diff) | |
| parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
| download | mariadb-git-780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index b216f5d2a41..8bd0e7e2cce 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2010, 2017, MariaDB Corporation. + Copyright (c) 2010, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -266,6 +266,7 @@ extern ulong my_sync_count; extern uint mysys_usage_id; extern int32 my_file_opened; extern my_bool my_init_done, my_thr_key_mysys_exists; +extern MYSQL_PLUGIN_IMPORT my_bool my_assert; extern my_bool my_assert_on_error; extern myf my_global_flags; /* Set to MY_WME for more error messages */ /* Point to current my_message() */ |