diff options
| author | unknown <gluh@eagle.(none)> | 2008-02-29 14:05:38 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2008-02-29 14:05:38 +0400 |
| commit | 8bdb243fd7a9ef7dee3eeafdc1dd7050e816cbeb (patch) | |
| tree | dab52058ac84180fe00c686fe1fd5406f707b803 /sql/mysql_priv.h | |
| parent | 7f572871ad24e293f60fde3c4ee597de7a581516 (diff) | |
| parent | ab6042590186ad14bbd73a64f5d1f3f77223bdb3 (diff) | |
| download | mariadb-git-8bdb243fd7a9ef7dee3eeafdc1dd7050e816cbeb.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
sql/mysql_priv.h:
Auto merged
mysql-test/r/symlink.result:
manual merge
mysql-test/t/symlink.test:
manual merge
sql/mysqld.cc:
manual merge
sql/sql_parse.cc:
manual merge
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 a45fda8e9f8..59ec18e1a3d 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1255,6 +1255,7 @@ void my_dbopt_free(void); extern time_t server_start_time; extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], mysql_real_data_home[], *opt_mysql_tmpdir, mysql_charsets_dir[], + mysql_unpacked_real_data_home[], def_ft_boolean_syntax[sizeof(ft_boolean_syntax)]; #define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list)) extern MY_TMPDIR mysql_tmpdir_list; |