diff options
| author | msvensson@pilot.blaudden <> | 2007-02-20 16:26:30 +0100 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-02-20 16:26:30 +0100 |
| commit | 0cc2e14040627a93630dbd8ac5169386d7843acd (patch) | |
| tree | b20f73d5a66ec3519f80272808db953e9f39e58a /sql/set_var.cc | |
| parent | 104995f2e7fb2300f5a2e0e333778b2296742f8d (diff) | |
| parent | 6caa0a232ed6f741e6c8c9e8d6a89e272dec6505 (diff) | |
| download | mariadb-git-0cc2e14040627a93630dbd8ac5169386d7843acd.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 8a31cdf32ce..1e41618e08d 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -655,6 +655,10 @@ sys_var_thd_time_zone sys_time_zone("time_zone"); /* Read only variables */ +/* Global read-only variable containing hostname */ +sys_var_const_str sys_hostname("hostname", glob_hostname); + + sys_var_have_variable sys_have_compress("have_compress", &have_compress); sys_var_have_variable sys_have_crypt("have_crypt", &have_crypt); sys_var_have_variable sys_have_csv_db("have_csv", &have_csv_db); @@ -779,6 +783,7 @@ SHOW_VAR init_vars[]= { {sys_var_general_log.name, (char*) &opt_log, SHOW_MY_BOOL}, {sys_var_general_log_path.name, (char*) &sys_var_general_log_path, SHOW_SYS}, {sys_group_concat_max_len.name, (char*) &sys_group_concat_max_len, SHOW_SYS}, + {sys_hostname.name, (char*) &sys_hostname, SHOW_SYS}, {sys_have_compress.name, (char*) &have_compress, SHOW_HAVE}, {sys_have_crypt.name, (char*) &have_crypt, SHOW_HAVE}, {sys_have_csv_db.name, (char*) &have_csv_db, SHOW_HAVE}, |