diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-14 14:45:15 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-14 14:45:15 +0100 |
| commit | 555aed64aa38475f424a3620b79a3b5e9d0ddb67 (patch) | |
| tree | d9ed3a93c532522c244c012360f4d33a5f907e17 /sql/mysql_priv.h | |
| parent | 12d6c6eb18320e3c22e1844b7df993523a160110 (diff) | |
| parent | c4ae01e6f0e9055f0e541aa42a653c6ab0e24b7b (diff) | |
| download | mariadb-git-555aed64aa38475f424a3620b79a3b5e9d0ddb67.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
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 b2a1923e19c..c0b76c7240b 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1272,6 +1272,7 @@ extern my_bool opt_slave_compressed_protocol, use_temp_pool; 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; +extern char* opt_secure_file_priv; extern my_bool opt_log_slow_admin_statements; extern my_bool sp_automatic_privileges, opt_noacl; extern my_bool opt_old_style_user_limits, trust_function_creators; |