database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Assorted fixes for test failures.

Browse Source 
mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test:
  The server shared memory name is located in the server's
  temporary directory, not in the mysqltest one.
sql/sql_show.cc:
  */ ends a comment, add space to avoid problems.
This commit is contained in:
Davi Arnaut
2010-11-22 14:10:44 -02:00
parent d1f6adcfc4
commit 2d1d7b1323
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result
View File

@@ -1,20 +1,20 @@
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;

10
mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test
View File

@@ -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';
# #

8
sql/sql_show.cc
View File

@@ -596,11 +596,11 @@ public:
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.
At this point we know if top_view is really a view. At this point we know if top_view is really a view.
*/ */
@@ -610,7 +610,7 @@ public:
m_handling= TRUE; m_handling= TRUE;
bool is_handled; bool is_handled;
switch (sql_errno) switch (sql_errno)
{ {
case ER_TABLEACCESS_DENIED_ERROR: case ER_TABLEACCESS_DENIED_ERROR: