diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2017-10-30 16:06:42 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2017-10-30 16:06:42 +0400 |
| commit | fe8cf8fdf1c4c0a9ec60690a8d2738fd255c8dd5 (patch) | |
| tree | df4b7627292d101197092aea46feb3fc5a12f99e | |
| parent | f88fcf2514c64df8408e9df41dc129ab6f655c18 (diff) | |
| download | mariadb-git-fe8cf8fdf1c4c0a9ec60690a8d2738fd255c8dd5.tar.gz | |
Embedded tests fixed.
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_embedded.result | 14 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 4392093e627..3e510fb12ac 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -122,6 +122,20 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME BIND_ADDRESS +SESSION_VALUE NULL +GLOBAL_VALUE 127.0.0.1 +GLOBAL_VALUE_ORIGIN CONFIG +DEFAULT_VALUE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE VARCHAR +VARIABLE_COMMENT IP address to bind to. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY YES +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ANNOTATE_ROW_EVENTS SESSION_VALUE ON GLOBAL_VALUE ON diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 87318694bab..fd704ca6dae 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -382,12 +382,10 @@ static Sys_var_charptr Sys_basedir( READ_ONLY GLOBAL_VAR(mysql_home_ptr), CMD_LINE(REQUIRED_ARG, 'b'), IN_FS_CHARSET, DEFAULT(0)); -#ifndef EMBEDDED_LIBRARY static Sys_var_charptr Sys_my_bind_addr( "bind_address", "IP address to bind to.", READ_ONLY GLOBAL_VAR(my_bind_addr_str), CMD_LINE(REQUIRED_ARG), IN_FS_CHARSET, DEFAULT(0)); -#endif static Sys_var_ulonglong Sys_binlog_cache_size( "binlog_cache_size", "The size of the transactional cache for " |