From: Bjorn Munch Date: November 25 2010 9:28am Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3119) List-Archive: http://lists.mysql.com/commits/124990 Message-Id: <201011250928.oAP9Sjd6014927@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0979316645==" --===============0979316645== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/mtr-55/ based on revid:bjorn.munch@stripped 3119 Bjorn Munch 2010-11-25 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 === 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'; # --===============0979316645== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/mtr-55/ # testament_sha1: 30b7820428ca24bfdb809d1a62636540f7cf8551 # timestamp: 2010-11-25 10:28:45 +0100 # source_branch: file:///home/bm136801/my/notspc-51/ # base_revision_id: bjorn.munch@stripped\ # wkxngbcyfs8475ba # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe21/2QAAmDfgAAwVGP/93Zn /CC////wUATsvaBQvOLtWxQvCSSaTTSNPAg0TRhogYIyGg0Gg5gAJkwAJhMEwhgCMACU0giTwkek 2poNNAAAB6gAARUkZPUymaIeU000AaDIAaaaZqACSRMjQaATRD0mnqKGah6mgYgANeIaiWrRvYZm HOZ3Cm7xMEd4B1+mp6mBD6pHq1gtRVhTieE6CthZTsKxAJJB6YMxDFVApjSmUnkhKpVqUbJRthN4 E0SUkk+GViu8y/vjcfCPNNcgphnlouRD6J4D1doCBhHWK7Ui1ZJYqQ+EL2ISGpBCPT0RQG1qxNEY w/Y7gVgLb+eaHalFsTwRgXRClJMGdJA4leMWIGdhrdgcNxi4TRGIgQkEVqDoP/isQOGj7kOOtdIL 1c+WJyNuJEkiyiFBJGNy7DAXSHlm5uezFYO/cJOsDO7XKokxHSw160nM1DC8wTjlGm0HRHzYemQF VzQBs3F9pN6NSbgORF5ICjBkXWOHUPmrpA8kW6EkTN6+gGU3HoGd8bB4MbAUXNaEMKB6NWwcWPes HBg8ibRVdA6OYNJZzI21XumUAW3Xf4yrooJlFttl5YyIEDHjeA7a+ZD6kZqh6RQsAsCD1SNhxnmU 2XVZZBrn1L+9iGXcSGGDcCkJvuzGMTAdAeaGV6tm5ii5xjeDi36AKuQFXKsaN6JgSN/Jc8yktHFn AF8MG72KrO95QA++sJ3rMZFIY9ngcNvtz0q6LwvzKsrYd9YGF81tN4TdRRFoTcEXBTg8WoYnQnyc DZ7TSyGZ00BafScOjRnBsDvNktohBhCFh3Y5FZDSS5iQ1h7K61dJEibFd9NCaG/C1MUIFCupWc1k CJYrcVwxVwFssVmJTiku1BSseRwzIxoGEtvS8HOFXXqMZqHaSNf2tHn6AtxDGrb0RHLh5FCU9iaS dB0JR84LSQNKd2yjcNelcXAOVgvLKC2KOIzLaeKYd9t2JLCpL4RLoGJKfSWnj4RZ7EjJAHIGoWmX IxMaYeW6aQjZaHypBz0SQT8JeIQu8SYB6EZ/M52FHLzfidXZs5bJ7RnZ0CkLKLyCtFxYYoH9CCuF 9E7SzX5eaNofpxggtWaZB5aSwO7uq+MHVCkMh6HvOZuaHG1/kOFnyWMSkVZlN5gYi5d6c/kBccsY pgLZWAyFgVwhdxRL6Mhu0XGEuzOkJuJqGQ3LEown5Cum3fT37o6vPfoB7eILYUAbRH9Lc6BBEnB5 o9SCOxIEwZ4+yUnn2iXVOSmg1qM4zQRgHsC/0+CKq6wk4E3uZPNxlOxgVKIM3/JxxkF4njAzy7yX b0ysqZ7TgB5ki9SOO01oU3JsoZZcwFXRhgZ685Zot5U46JaeuPqElWgOOKQDojvR1u7ZqshWAW1v xfZYFNPwYF06KnDKmSDTAsZXHbRmyM3FS1REvCYdKUXpTC1DCbX7zhFuTmep+DjgCLzgItCd1YV1 G2FxWixbsUMGccudIvnUCdtddcZ28VLf58bgnzsyWy21k4ZbSEHsCnAt6oqSguRdyRThQkO21/2Q --===============0979316645==--