From: Tor Didriksen
Date: September 22 2011 9:39am
Subject: bzr push into mysql-trunk branch (tor.didriksen:3445 to 3448)
List-Archive: http://lists.mysql.com/commits/141080
Message-Id: <201109220939.p8M9d3qi020842@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3448 Tor Didriksen	2011-09-22 [merge]
      merge trunk => wl5825

    removed:
      support-files/config.huge.ini.sh
      support-files/config.medium.ini.sh
      support-files/config.small.ini.sh
      support-files/ndb-config-2-node.ini.sh
    modified:
      client/mysqltest.cc
      extra/perror.c
      plugin/auth/qa_auth_interface.c
      storage/innobase/include/srv0mon.h
      storage/innobase/os/os0file.c
      storage/innobase/read/read0read.c
      storage/innobase/trx/trx0purge.c
      support-files/CMakeLists.txt
      tests/mysql_client_test.c
 3447 Tor Didriksen	2011-09-22
      clear early_options vector after using it

    modified:
      sql/mysqld.cc
 3446 Tor Didriksen	2011-09-22 [merge]
      merge trunk => wl5825

    added:
      mysql-test/r/auth_rpl.result
      mysql-test/suite/opt_trace/include/filesort_pq.inc
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/t/filesort_pq.test
      mysql-test/t/auth_rpl-master.opt
      mysql-test/t/auth_rpl-slave.opt
      mysql-test/t/auth_rpl.test
    modified:
      cmake/mysql_version.cmake
      include/mysql/psi/mysql_socket.h
      libmysql/client_settings.h
      mysql-test/include/mtr_check.sql
      mysql-test/r/derived.result
      mysql-test/r/func_str.result
      mysql-test/r/myisampack.result
      mysql-test/r/query_cache.result
      mysql-test/r/view_grant.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/perfschema/t/socket_instances_func.test
      mysql-test/suite/perfschema/t/socket_instances_func_win.test
      mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
      mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
      mysql-test/t/derived.test
      mysql-test/t/func_str.test
      mysql-test/t/myisampack.test
      mysql-test/t/query_cache.test
      mysql-test/t/view_grant.test
      mysql-test/valgrind.supp
      sql/client_settings.h
      sql/filesort.cc
      sql/opt_range.cc
      sql/opt_trace.h
      sql/rpl_slave.cc
      sql/share/errmsg-utf8.txt
      sql/sql_base.cc
      sql/sql_cache.cc
      sql/sql_select.cc
      sql/sql_test.cc
      sql/sql_test.h
      sql/sql_update.cc
      sql/table.h
      storage/innobase/row/row0purge.c
      storage/myisam/ft_boolean_search.c
      storage/myisam/ft_nlq_search.c
      storage/myisam/mi_check.c
      storage/myisam/mi_write.c
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      strings/dtoa.c
      support-files/mysql.spec.sh
 3445 Tor Didriksen	2011-09-21
      Revert some cmake debugging.
      Fix list of exported symbols in create_def_file.js

    modified:
      cmake/os/Windows.cmake
      sql/CMakeLists.txt
      win/create_def_file.js

Diff too large for email (15675 lines, the limit is 10000).
No bundle (reason: useless for push emails).