diff options
| author | hf@deer.(none) <> | 2004-06-01 22:47:28 +0500 |
|---|---|---|
| committer | hf@deer.(none) <> | 2004-06-01 22:47:28 +0500 |
| commit | 12c217bb218555d8f6d6c57d8c8ec0401e53f745 (patch) | |
| tree | eda8cbabc2f8742048d9d2e399f8d5cfb64444d5 /sql | |
| parent | de5feec0013e56aab07e0d8d689756270bf8bc0d (diff) | |
| parent | 39f69a212622e1da36f7b6a86057a4c2080299a0 (diff) | |
| download | mariadb-git-12c217bb218555d8f6d6c57d8c8ec0401e53f745.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 11 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index fb9ff5be771..368774877d0 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -918,6 +918,7 @@ extern struct my_option my_long_options[]; extern SHOW_COMP_OPTION have_isam, have_innodb, have_berkeley_db, have_example_db; extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink; extern SHOW_COMP_OPTION have_query_cache, have_berkeley_db, have_innodb; +extern SHOW_COMP_OPTION have_geometry, have_rtree_keys; extern SHOW_COMP_OPTION have_crypt; extern SHOW_COMP_OPTION have_compress; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d6ecbd990c1..ccdb8674bc3 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -378,6 +378,7 @@ CHARSET_INFO *national_charset_info, *table_alias_charset; SHOW_COMP_OPTION have_berkeley_db, have_innodb, have_isam, have_ndbcluster, have_example_db; SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_query_cache; +SHOW_COMP_OPTION have_geometry, have_rtree_keys; SHOW_COMP_OPTION have_crypt, have_compress; /* Thread specific variables */ @@ -5362,6 +5363,16 @@ static void mysql_init_variables(void) #else have_query_cache=SHOW_OPTION_NO; #endif +#ifdef HAVE_SPATIAL + have_geometry=SHOW_OPTION_YES; +#else + have_geometry=SHOW_OPTION_NO; +#endif +#ifdef HAVE_RTREE_KEYS + have_rtree_keys=SHOW_OPTION_YES; +#else + have_rtree_keys=SHOW_OPTION_NO; +#endif #ifdef HAVE_CRYPT have_crypt=SHOW_OPTION_YES; #else diff --git a/sql/set_var.cc b/sql/set_var.cc index b3b0153652b..1112a869515 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -643,10 +643,12 @@ struct show_var_st init_vars[]= { {"have_crypt", (char*) &have_crypt, SHOW_HAVE}, {"have_innodb", (char*) &have_innodb, SHOW_HAVE}, {"have_isam", (char*) &have_isam, SHOW_HAVE}, + {"have_geometry", (char*) &have_geometry, SHOW_HAVE}, {"have_ndbcluster", (char*) &have_ndbcluster, SHOW_HAVE}, {"have_openssl", (char*) &have_openssl, SHOW_HAVE}, {"have_query_cache", (char*) &have_query_cache, SHOW_HAVE}, {"have_raid", (char*) &have_raid, SHOW_HAVE}, + {"have_rtree_keys", (char*) &have_rtree_keys, SHOW_HAVE}, {"have_symlink", (char*) &have_symlink, SHOW_HAVE}, {"init_connect", (char*) &sys_init_connect, SHOW_SYS}, {"init_file", (char*) &opt_init_file, SHOW_CHAR_PTR}, |