bzr push into mysql-trunk-mtr branch (bjorn.munch:2991 to 2992)

[Bjorn Munch]

 2992 Bjorn Munch	2010-11-25 [merge]
      Test sys_vars.shared_memory_base_name_basic used wrong path

    modified:
      mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result
      mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test
 2991 Bjorn Munch	2010-11-24 [merge]
      upmerge 58424 and 43418 follow-up

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result'
--- a/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result	2010-11-25 09:28:36 +0000
@@ -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;

=== modified file 'mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test'
--- a/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test	2010-02-21 14:10:52 +0000
+++ b/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test	2010-11-25 09:28:36 +0000
@@ -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';
 
 #

No bundle (reason: useless for push emails).