Viewing all changes in revision 2643.105.39.
- Committer: Michael Widenius
- Date: 2010-11-29 09:55:57 UTC
- mfrom: (2643.96.31 maria-5.1-release)
- mto: (2643.114.1 5.1) (2890.1.2 maria-5.2) (2903.1.1 maria-5.2) (2956.1.1 maria-5.2) (2959.1.1 maria-5.2) (2978.1.1 maria-5.2) (2993.1.3 maria-5.2-new) (3043.1.1 work-maria-5.2-merge) (3042.1.1 maria-5.2) (3098.1.1 5.2) (3106.1.1 maria-5.2) (3163.1.1 work-5.2-mdev382)
- mto: This revision was merged to the branch mainline in revision 2888.
- Revision ID: monty@mysql.com-20101129095557-cmlr2p03en5yf0jl
Automatic merge with 5.1-release
- files added:
- mysql-test/extra/rpl_tests/rpl_stop_slave.test
- mysql-test/suite/percona/query_cache_enhance.patch
- mysql-test/suite/percona/slow_extended.patch
- mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt
- mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result
- mysql-test/suite/percona/slow_extended.patch/show_slave_status_nolock.patch
- files removed:
- mysql-test/include/percona_query_cache_with_comments.inc
- mysql-test/suite/percona/percona_log_slow_slave_statements-and-use_global_long_query_time-master.opt
- files modified:
- BUILD/SETUP.sh
expand all
collapse all
added
removed
