diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-02 08:19:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-02 08:19:57 +0300 |
| commit | ef3070e997a6e90c8eadaa833dc47324c2167bb4 (patch) | |
| tree | cea18cf54188376147d7e4457397c9c663022f27 /sql/mysqld.h | |
| parent | a90b3862d921ebaeaf3c998cd742e883d2d4af04 (diff) | |
| parent | 2fb68244b4246221e4f605749913bfe582a4d040 (diff) | |
| download | mariadb-git-ef3070e997a6e90c8eadaa833dc47324c2167bb4.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 5a2dc6dce8d..2604121a9f1 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -166,7 +166,8 @@ extern ulong opt_tc_log_size, tc_log_max_pages_used, tc_log_page_size; extern ulong tc_log_page_waits; extern my_bool relay_log_purge, opt_innodb_safe_binlog, opt_innodb; extern my_bool relay_log_recovery; -extern uint test_flags,select_errors,ha_open_options; +extern uint select_errors,ha_open_options; +extern ulonglong test_flags; extern uint protocol_version, mysqld_port, dropping_tables; extern ulong delay_key_write_options; extern char *opt_logname, *opt_slow_logname, *opt_bin_logname, |