diff options
| author | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
| commit | 10001c8e4f4bf08b3c491dce2714e13cca667890 (patch) | |
| tree | 738ffc405ffa9a11753f7b9a781f244dc270f803 /sql/mysqld.h | |
| parent | f68eac2eadb9bdb3d9c3554b37d6c253f04562d2 (diff) | |
| parent | 5426facdcbfba2d78dab3c709cbf278073383b7c (diff) | |
| download | mariadb-git-10001c8e4f4bf08b3c491dce2714e13cca667890.tar.gz | |
Automatic merge
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 1b34c485101..dd80a6cf423 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -96,7 +96,7 @@ extern uint connection_count; extern my_bool opt_safe_user_create; extern my_bool opt_safe_show_db, opt_local_infile, opt_myisam_use_mmap; extern my_bool opt_slave_compressed_protocol, use_temp_pool; -extern ulong slave_exec_mode_options; +extern ulong slave_exec_mode_options, slave_ddl_exec_mode_options; extern ulong slave_retried_transactions; extern ulonglong slave_type_conversions_options; extern my_bool read_only, opt_readonly; |