diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-10 08:02:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-10 08:02:21 +0300 |
| commit | b2f3755c8e174ec5385c9a56783f0a77f054c562 (patch) | |
| tree | bb00279f39334fb1a9afceca99da2c3179ec94df /sql/mysqld.h | |
| parent | 136a27d9f16fd19f0196a798d752a3dcf0fe57c2 (diff) | |
| parent | 3e8cab51cb78f3e60e139af944eef8f25502fc81 (diff) | |
| download | mariadb-git-b2f3755c8e174ec5385c9a56783f0a77f054c562.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index b02bd9fb1f6..7177f0b2e20 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -66,7 +66,7 @@ typedef Bitmap<((MAX_INDEXES+7)/8*8)> key_map; /* Used for finding keys */ #define OPT_SESSION SHOW_OPT_SESSION #define OPT_GLOBAL SHOW_OPT_GLOBAL -extern MY_TIMER_INFO sys_timer_info; +extern MYSQL_PLUGIN_IMPORT MY_TIMER_INFO sys_timer_info; /* Values for --slave-parallel-mode |