From: Sergey Vojtovich Date: December 8 2010 12:11pm Subject: bzr push into mysql-5.5-bugteam branch (sergey.vojtovich:3177 to 3178) List-Archive: http://lists.mysql.com/commits/126309 Message-Id: <201012081205.oB89vFRG006417@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0044012642338892673==" --===============0044012642338892673== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3178 Sergey Vojtovich 2010-12-08 [merge] Merge fix for BUG58205 to 5.5-bugteam. modified: mysql-test/r/archive.result mysql-test/t/archive.test mysys/mf_pack.c storage/archive/ha_archive.cc 3177 Marc Alff 2010-12-07 Bug#58798 SHOW ENGINE PERFORMANCE_SCHEMA STATUS: incorrect table lettercase Before this fix, the output of SHOW ENGINE PERFORMANCE_SCHEMA STATUS used uppercase to name performance schema tables. This is inconsistent since performance schema tables have been renamed to lowercase. Also, an old table 'PROCESSLIST' was still visible, even after this table got renamed to 'threads'. This fix: - correctly uses lowercases in the output, to match the current naming. - replaced 'PROCESSLIST' with 'threads'. Tested the output of SHOW ENGINE PERFORMANCE_SCHEMA STATUS manually. No automated test cases can be written for this, since the output is too platform dependent (sizes). modified: storage/perfschema/pfs_engine_table.cc === modified file 'mysql-test/r/archive.result' --- a/mysql-test/r/archive.result 2010-07-26 15:54:20 +0000 +++ b/mysql-test/r/archive.result 2010-12-01 12:56:46 +0000 @@ -12801,3 +12801,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 DROP TABLE t1; +# +# BUG#58205 - Valgrind failure in fn_format when called from +# archive_discover +# +CREATE TABLE `a/../`(a INT) ENGINE=ARCHIVE; +DROP TABLE `a/../`; === modified file 'mysql-test/t/archive.test' --- a/mysql-test/t/archive.test 2010-07-26 15:54:20 +0000 +++ b/mysql-test/t/archive.test 2010-12-01 12:56:46 +0000 @@ -1722,3 +1722,11 @@ INSERT INTO t1 VALUES (2); SELECT * FROM t1 ORDER BY a; SHOW CREATE TABLE t1; DROP TABLE t1; + +--echo # +--echo # BUG#58205 - Valgrind failure in fn_format when called from +--echo # archive_discover +--echo # +CREATE TABLE `a/../`(a INT) ENGINE=ARCHIVE; +remove_file $MYSQLD_DATADIR/test/a@002f@002e@002e@stripped; +DROP TABLE `a/../`; === modified file 'mysys/mf_pack.c' --- a/mysys/mf_pack.c 2010-07-15 13:47:50 +0000 +++ b/mysys/mf_pack.c 2010-12-01 12:56:46 +0000 @@ -192,7 +192,8 @@ size_t cleanup_dirname(register char *to end_parentdir=pos; while (pos >= start && *pos != FN_LIBCHAR) /* remove prev dir */ pos--; - if (pos[1] == FN_HOMELIB || memcmp(pos,parent,length) == 0) + if (pos[1] == FN_HOMELIB || + (pos > start && memcmp(pos, parent, length) == 0)) { /* Don't remove ~user/ */ pos=strmov(end_parentdir+1,parent); *pos=FN_LIBCHAR; === modified file 'storage/archive/ha_archive.cc' --- a/storage/archive/ha_archive.cc 2010-10-06 14:34:28 +0000 +++ b/storage/archive/ha_archive.cc 2010-12-01 12:56:46 +0000 @@ -20,6 +20,7 @@ #include "sql_priv.h" #include "probes_mysql.h" #include "sql_class.h" // SSV +#include "sql_table.h" #include #include "ha_archive.h" @@ -256,7 +257,7 @@ int archive_discover(handlerton *hton, T char *frm_ptr; MY_STAT file_stat; - fn_format(az_file, name, db, ARZ, MY_REPLACE_EXT | MY_UNPACK_FILENAME); + build_table_filename(az_file, sizeof(az_file) - 1, db, name, ARZ, 0); if (!(my_stat(az_file, &file_stat, MYF(0)))) goto err; --===============0044012642338892673== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/sergey.vojtovich@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sergey.vojtovich@stripped\ # gd8fvhvog8s3dfab # target_branch: file:///home/svoj/mysql/server/mysql-5.5-bugteam-\ # push/ # testament_sha1: 4c0826e7d3bb9c9a848bd4b46338a1ddeac59798 # timestamp: 2010-12-08 15:11:37 +0300 # source_branch: file:///home/svoj/mysql/server/mysql-5.5-bugteam-\ # bug58205/ # base_revision_id: marc.alff@stripped\ # gq17etcfrzskrlgr # # Begin bundle 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 --===============0044012642338892673==--