From b2d1b1f897efe70e92238edd9ddde6fc54cae167 Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Thu, 25 Nov 2010 10:28:36 +0100 Subject: [PATCH] Test sys_vars.shared_memory_base_name_basic used wrong path --- .../sys_vars/r/shared_memory_base_name_basic.result | 10 +++++----- .../sys_vars/t/shared_memory_base_name_basic.test | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result b/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result index a94a906e121..356b3c9e879 100644 --- a/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result +++ b/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result @@ -1,20 +1,20 @@ select @@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; ERROR HY000: Variable 'shared_memory_base_name' is a GLOBAL variable show global variables like 'shared_memory_base_name'; 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'; 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'; 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'; 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; ERROR HY000: Variable 'shared_memory_base_name' is a read only variable set session shared_memory_base_name=1; diff --git a/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test b/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test index 24418a78687..da165564791 100644 --- a/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test +++ b/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test @@ -3,17 +3,17 @@ # # only global # ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR select @@global.shared_memory_base_name; --error ER_INCORRECT_GLOBAL_LOCAL_VAR 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'; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR 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'; ---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'; #