summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2010-12-07 20:08:54 +0300
committerRamil Kalimullin <ramil@mysql.com>2010-12-07 20:08:54 +0300
commitd33574fbf747aac57fc9f16b669ee92ad66d06f6 (patch)
treec696b862453a3634c852c69a8c823e445624e159 /sql/mysqld.h
parente11d7971fd2f1793d78a9ca018d4850aec51a830 (diff)
downloadmariadb-git-d33574fbf747aac57fc9f16b669ee92ad66d06f6.tar.gz
Fix for bug #58669: read_only not enforced on 5.5.x
merged from mysql-5.5.8-release tree, revision: ramil@mysql.com-20101203174908-217tdkn150vieha9
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 712b26382d1..5d8885ac277 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -107,7 +107,8 @@ 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 ulonglong slave_type_conversions_options;
-extern my_bool opt_readonly, lower_case_file_system;
+extern my_bool read_only, opt_readonly;
+extern my_bool lower_case_file_system;
extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
extern my_bool opt_secure_auth;
extern char* opt_secure_file_priv;