diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-06 02:46:36 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-06 02:46:36 +0200 |
| commit | e18a399c037ac5983bb3fc786926b18bca441617 (patch) | |
| tree | bd60bc36af44abc2241cfeb19061907fbc604187 /sql/mysql_priv.h | |
| parent | 6e0c500e7d53bb89431406144a774ae0064fcd93 (diff) | |
| parent | 11e4085e98a94ee6fc9180f95bd0ccc612201053 (diff) | |
| download | mariadb-git-e18a399c037ac5983bb3fc786926b18bca441617.tar.gz | |
merge
mysql-test/t/ctype_many.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 182e69653f8..1e0f7884176 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -710,6 +710,8 @@ 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, lower_case_table_names; extern my_bool opt_slave_compressed_protocol, use_temp_pool; extern my_bool opt_enable_named_pipe; +extern char *shared_memory_base_name; +extern bool opt_enable_shared_memory; extern char f_fyllchar; extern MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log; |