diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-06 16:38:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-06 16:38:40 +0100 |
| commit | 1b3c15f1995531a1263139fe1bdde570f1b93b19 (patch) | |
| tree | f4bc1013d3b67a3b971f66b553ce0e1728529cc8 /sql/mysqld.h | |
| parent | c73718d917e903bddf7059cd8a515066f04311d1 (diff) | |
| parent | 313f18be5a4b9c56d9c7331227f72e3f2fa4f9fe (diff) | |
| download | mariadb-git-1b3c15f1995531a1263139fe1bdde570f1b93b19.tar.gz | |
merge with 10.0-monty
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; |