summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2010-12-03 20:49:08 +0300
committerRamil Kalimullin <ramil@mysql.com>2010-12-03 20:49:08 +0300
commitdb2f37dc31a60fdda020e67d19dda79861adadde (patch)
treef6837ac31a18a3beaceeae63ccda5daa0ba45d7a /sql/mysqld.h
parent6929cd95a6bd9fd9a237f4afede02222840f7033 (diff)
downloadmariadb-git-mysql-5.5.8.tar.gz
Fix for bug #58669: read_only not enforced on 5.5.xmysql-5.5.8
Problem: "read-only" option ignored if it's enabled in the command line (or in the config file). Fix: sync opt_readonly (which is used for checks) with read_only (global var) when all server options are handled. mysql-test/r/bug58669.result: Fix for bug #58669: read_only not enforced on 5.5.x - test result. mysql-test/t/bug58669-master.opt: Fix for bug #58669: read_only not enforced on 5.5.x - test case. mysql-test/t/bug58669.test: Fix for bug #58669: read_only not enforced on 5.5.x - test case. sql/mysqld.cc: Fix for bug #58669: read_only not enforced on 5.5.x - sync opt_readonly boolean with read_only boolean in the get_options(). sql/mysqld.h: Fix for bug #58669: read_only not enforced on 5.5.x - sync opt_readonly boolean with read_only boolean in the get_options(). sql/sys_vars.cc: Fix for bug #58669: read_only not enforced on 5.5.x - sync opt_readonly boolean with read_only boolean in the get_options().
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 376d8440619..7fe4dc7258a 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;