diff options
| author | Mats Kindahl <mats@sun.com> | 2009-12-15 21:21:00 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2009-12-15 21:21:00 +0100 |
| commit | f9abd14225821a3912a15baa199bcbec7d9e65c1 (patch) | |
| tree | d3057d76feb0f4419510a9a2a77dcc4263948d7f /sql/mysql_priv.h | |
| parent | ac647f5a3eb12313f981800ac1fd0c562402abcc (diff) | |
| parent | 9e980bf79ef0c727c630e79c1bc043c48bc947ee (diff) | |
| download | mariadb-git-f9abd14225821a3912a15baa199bcbec7d9e65c1.tar.gz | |
Merging with mysql-5.1-rep+2
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index ca7dfc4e204..abd1d58d4e9 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1926,6 +1926,7 @@ extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types; 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_type_conversions_options; extern my_bool opt_readonly, lower_case_file_system; extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs; extern my_bool opt_secure_auth; |