Commit e9379baa authored by Davi Arnaut's avatar Davi Arnaut

Assorted fixes for test failures.

parent 522d5e5a
select @@global.shared_memory_base_name; select @@global.shared_memory_base_name;
@@global.shared_memory_base_name @@global.shared_memory_base_name
MYSQLTEST_VARDIR/tmp/mysqld.1.sock MYSQL_TMP_DIR/mysqld.1.sock
select @@session.shared_memory_base_name; select @@session.shared_memory_base_name;
ERROR HY000: Variable 'shared_memory_base_name' is a GLOBAL variable ERROR HY000: Variable 'shared_memory_base_name' is a GLOBAL variable
show global variables like 'shared_memory_base_name'; show global variables like 'shared_memory_base_name';
Variable_name Value Variable_name Value
shared_memory_base_name MYSQLTEST_VARDIR/tmp/mysqld.1.sock shared_memory_base_name MYSQL_TMP_DIR/mysqld.1.sock
show session variables like 'shared_memory_base_name'; show session variables like 'shared_memory_base_name';
Variable_name Value Variable_name Value
shared_memory_base_name MYSQLTEST_VARDIR/tmp/mysqld.1.sock shared_memory_base_name MYSQL_TMP_DIR/mysqld.1.sock
select * from information_schema.global_variables where variable_name='shared_memory_base_name'; select * from information_schema.global_variables where variable_name='shared_memory_base_name';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
SHARED_MEMORY_BASE_NAME MYSQLTEST_VARDIR/tmp/mysqld.1.sock SHARED_MEMORY_BASE_NAME MYSQL_TMP_DIR/mysqld.1.sock
select * from information_schema.session_variables where variable_name='shared_memory_base_name'; select * from information_schema.session_variables where variable_name='shared_memory_base_name';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
SHARED_MEMORY_BASE_NAME MYSQLTEST_VARDIR/tmp/mysqld.1.sock SHARED_MEMORY_BASE_NAME MYSQL_TMP_DIR/mysqld.1.sock
set global shared_memory_base_name=1; set global shared_memory_base_name=1;
ERROR HY000: Variable 'shared_memory_base_name' is a read only variable ERROR HY000: Variable 'shared_memory_base_name' is a read only variable
set session shared_memory_base_name=1; set session shared_memory_base_name=1;
......
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
# #
# only global # only global
# #
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
select @@global.shared_memory_base_name; select @@global.shared_memory_base_name;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@session.shared_memory_base_name; select @@session.shared_memory_base_name;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
show global variables like 'shared_memory_base_name'; show global variables like 'shared_memory_base_name';
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
show session variables like 'shared_memory_base_name'; show session variables like 'shared_memory_base_name';
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
select * from information_schema.global_variables where variable_name='shared_memory_base_name'; select * from information_schema.global_variables where variable_name='shared_memory_base_name';
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
select * from information_schema.session_variables where variable_name='shared_memory_base_name'; select * from information_schema.session_variables where variable_name='shared_memory_base_name';
# #
......
...@@ -596,9 +596,9 @@ class Show_create_error_handler : public Internal_error_handler { ...@@ -596,9 +596,9 @@ class Show_create_error_handler : public Internal_error_handler {
return m_view_access_denied_message_ptr; return m_view_access_denied_message_ptr;
} }
bool handle_condition(THD *thd, uint sql_errno, const char */* sqlstate */, bool handle_condition(THD *thd, uint sql_errno, const char * /* sqlstate */,
MYSQL_ERROR::enum_warning_level level, MYSQL_ERROR::enum_warning_level level,
const char *message, MYSQL_ERROR **/* cond_hdl */) const char *message, MYSQL_ERROR ** /* cond_hdl */)
{ {
/* /*
The handler does not handle the errors raised by itself. The handler does not handle the errors raised by itself.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment