From: Dmitry Shulga Date: June 15 2011 10:21am Subject: bzr push into mysql-trunk branch (Dmitry.Shulga:3203 to 3204) Bug#12403662 List-Archive: http://lists.mysql.com/commits/139223 X-Bug: 12403662 Message-Id: <201106151021.p5FALjT7008099@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4553171416704094072==" --===============4553171416704094072== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3204 Dmitry Shulga 2011-06-15 [merge] Auto-merge of patch for bug#12403662 from mysql-5.5 tree. modified: mysys/mf_pack.c 3203 Vasil Dimov 2011-06-15 Install InnoDB persistent stats tables during db install time (from the script mysql_install_db). Reviewed by danny (over IRC) Tested by kevin on Windows and also ran full PB2 cycle on it. removed: mysql-test/suite/innodb/include/innodb_stats_bootstrap.inc storage/innobase/scripts/ storage/innobase/scripts/persistent_storage.sql modified: mysql-test/r/1st.result mysql-test/r/connect.result mysql-test/r/log_tables_upgrade.result mysql-test/r/lowercase_table4.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysql_upgrade_ssl.result mysql-test/r/mysqlcheck.result mysql-test/r/plugin_auth.result mysql-test/r/system_mysql_db.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/funcs_1/r/is_key_column_usage.result mysql-test/suite/funcs_1/r/is_statistics.result mysql-test/suite/funcs_1/r/is_statistics_mysql.result mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result mysql-test/suite/funcs_1/r/is_table_constraints.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result mysql-test/suite/funcs_1/r/is_tables_mysql.result mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result mysql-test/suite/innodb/r/innodb-system-table-view.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/r/innodb_bug57904.result mysql-test/suite/innodb/t/innodb-system-table-view.test mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb_bug11933790.test mysql-test/suite/innodb/t/innodb_bug57904.test mysql-test/suite/innodb/t/innodb_bug60049.test mysql-test/suite/innodb/t/innodb_stats.test mysql-test/suite/innodb/t/innodb_stats_drop_locked.test mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/t/system_mysql_db_fix40123.test mysql-test/t/system_mysql_db_fix50030.test mysql-test/t/system_mysql_db_fix50117.test scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh scripts/mysql_system_tables.sql === modified file 'mysys/mf_pack.c' --- a/mysys/mf_pack.c 2010-12-29 00:26:31 +0000 +++ b/mysys/mf_pack.c 2011-06-15 09:18:08 +0000 @@ -193,7 +193,7 @@ size_t cleanup_dirname(register char *to while (pos >= start && *pos != FN_LIBCHAR) /* remove prev dir */ pos--; if (pos[1] == FN_HOMELIB || - (pos > start && memcmp(pos, parent, length) == 0)) + (pos >= start && memcmp(pos, parent, length) == 0)) { /* Don't remove ~user/ */ pos=strmov(end_parentdir+1,parent); *pos=FN_LIBCHAR; --===============4553171416704094072== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/dmitry.shulga@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@stripped\ # 9p22b09g8ytr2ctb # target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/ # testament_sha1: 03ec2ae7bffc18c4d2e242a392603e519b0dcf83 # timestamp: 2011-06-15 17:21:41 +0700 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\ # bug11763757/ # base_revision_id: vasil.dimov@stripped\ # bml42gc1b1gndci6 # # Begin bundle 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 --===============4553171416704094072==--