From: Marc Alff Date: September 23 2011 1:37pm Subject: bzr push into mysql-trunk-wl5863 branch (marc.alff:3410 to 3411) List-Archive: http://lists.mysql.com/commits/141113 Message-Id: <201109231338.p8NDchoF017501@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3411 Marc Alff 2011-09-23 [merge] Merge mysql-trunk --> mysql-trunk-wl5863 modified: mysql-test/r/order_by_icp_mrr.result mysql-test/r/order_by_none.result mysql-test/r/plugin_auth.result mysql-test/suite/sys_vars/r/all_vars.result sql/binlog.cc sql/sql_lex.cc 3410 Marc Alff 2011-09-23 [merge] Merge mysql-trunk --> mysql-trunk-wl5863 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 added: 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 modified: client/mysql_plugin.c client/mysqltest.cc cmake/mysql_version.cmake cmake/plugin.cmake extra/perror.c include/mysql/plugin.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp include/mysql/psi/mysql_socket.h libmysql/authentication_win/common.cc libmysql/authentication_win/common.h libmysql/authentication_win/handshake_client.cc libmysql/authentication_win/log_client.cc mysql-test/include/mtr_check.sql mysql-test/include/order_by.inc mysql-test/mysql-test-run.pl mysql-test/r/ctype_errors.result mysql-test/r/ctype_utf16.result mysql-test/r/ctype_utf32_uca.result mysql-test/r/func_str.result mysql-test/r/order_by_all.result mysql-test/r/plugin_auth.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/type_float.result mysql-test/r/union.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/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/t/rpl_row_ignorable_event.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/t/ctype_errors.test mysql-test/t/ctype_utf32_uca.test mysql-test/t/func_str.test mysql-test/t/mysql_plugin.test mysql-test/t/plugin_auth.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/type_float.test mysql-test/t/union.test mysql-test/valgrind.supp plugin/audit_null/audit_null.c plugin/auth/auth_socket.c plugin/auth/dialog.c plugin/auth/qa_auth_interface.c plugin/auth/qa_auth_server.c plugin/auth/test_plugin.c plugin/daemon_example/daemon_example.cc plugin/fulltext/plugin_example.c plugin/semisync/semisync_master_plugin.cc plugin/semisync/semisync_slave_plugin.cc sql/filesort.cc sql/ha_ndbcluster.cc sql/ha_partition.cc sql/item_create.cc sql/item_strfunc.cc sql/item_strfunc.h sql/opt_range.cc sql/opt_trace.h sql/share/errmsg-utf8.txt sql/sql_acl.cc sql/sql_base.cc sql/sql_error.cc sql/sql_lex.cc sql/sql_plugin.cc sql/sql_test.cc sql/sql_test.h sql/sql_union.cc sql/sql_yacc.yy storage/archive/ha_archive.cc storage/blackhole/ha_blackhole.cc storage/csv/ha_tina.cc storage/example/ha_example.cc storage/federated/ha_federated.cc storage/heap/ha_heap.cc storage/innobase/btr/btr0pcur.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/include/btr0pcur.h storage/innobase/include/btr0pcur.ic storage/innobase/include/mtr0mtr.h storage/innobase/include/srv0mon.h storage/innobase/include/ut0mem.h storage/innobase/include/ut0mem.ic storage/innobase/mtr/mtr0mtr.c storage/innobase/os/os0file.c storage/innobase/read/read0read.c storage/innobase/row/row0purge.c storage/innobase/trx/trx0purge.c storage/innobase/ut/ut0mem.c storage/myisam/ha_myisam.cc storage/myisammrg/ha_myisammrg.cc storage/perfschema/ha_perfschema.cc storage/perfschema/pfs.cc storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h strings/dtoa.c support-files/CMakeLists.txt support-files/mysql.spec.sh tests/mysql_client_test.c === modified file 'mysql-test/r/order_by_icp_mrr.result' --- a/mysql-test/r/order_by_icp_mrr.result 2011-08-03 11:29:20 +0000 +++ b/mysql-test/r/order_by_icp_mrr.result 2011-09-23 12:22:58 +0000 @@ -2550,6 +2550,13 @@ a 1 3 1 2 1 DROP TABLE t1; +# +# Bug#11765255 58201: +# VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNCTIONS +# +select 1 order by max(1) + min(1); +1 +1 End of 5.1 tests # # Bug #38745: MySQL 5.1 optimizer uses filesort for ORDER BY === modified file 'mysql-test/r/order_by_none.result' --- a/mysql-test/r/order_by_none.result 2011-08-03 11:29:20 +0000 +++ b/mysql-test/r/order_by_none.result 2011-09-23 12:22:58 +0000 @@ -2549,6 +2549,13 @@ a 1 3 1 2 1 DROP TABLE t1; +# +# Bug#11765255 58201: +# VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNCTIONS +# +select 1 order by max(1) + min(1); +1 +1 End of 5.1 tests # # Bug #38745: MySQL 5.1 optimizer uses filesort for ORDER BY === modified file 'mysql-test/r/plugin_auth.result' --- a/mysql-test/r/plugin_auth.result 2011-09-21 11:01:41 +0000 +++ b/mysql-test/r/plugin_auth.result 2011-09-23 12:22:58 +0000 @@ -486,22 +486,17 @@ DROP USER bug12610784@localhost; # # Bug # 11766641: 59792: BIN/MYSQL -UUNKNOWN -PUNKNOWN # .-> USING PASSWORD: NO +# Bug #12818542: PAM: ADDING PASSWORD FOR AN ACCOUNT DISABLES PAM +# AUTHENTICATION SETTINGS # # shoud contain "using password=yes" ERROR 1045 (28000): Access denied for user 'unknown'@'localhost' (using password: YES) # shoud contain "using password=no" ERROR 1045 (28000): Access denied for user 'unknown'@'localhost' (using password: NO) -# -# Bug #12610784: SET PASSWORD INCORRECTLY KEEP AN OLD EMPTY PASSWORD -# CREATE USER bug12610784@localhost; SET PASSWORD FOR bug12610784@localhost = PASSWORD('secret'); ERROR 28000: Access denied for user 'bug12610784'@'localhost' (using password: NO) DROP USER bug12610784@localhost; -# -# Bug #12818542: PAM: ADDING PASSWORD FOR AN ACCOUNT DISABLES PAM -# AUTHENTICATION SETTINGS -# CREATE USER bug12818542@localhost IDENTIFIED WITH 'test_plugin_server' AS 'bug12818542_dest'; CREATE USER bug12818542_dest@localhost === modified file 'mysql-test/suite/sys_vars/r/all_vars.result' --- a/mysql-test/suite/sys_vars/r/all_vars.result 2011-09-23 10:55:10 +0000 +++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-09-23 12:22:58 +0000 @@ -31,7 +31,5 @@ INNODB_STATS_TRANSIENT_SAMPLE_PAGES INNODB_STATS_TRANSIENT_SAMPLE_PAGES INNODB_SYNC_ARRAY_SIZE INNODB_SYNC_ARRAY_SIZE -INNODB_LARGE_PREFIX -INNODB_LARGE_PREFIX drop table t1; drop table t2; === modified file 'sql/binlog.cc' --- a/sql/binlog.cc 2011-08-19 13:04:28 +0000 +++ b/sql/binlog.cc 2011-09-23 12:22:58 +0000 @@ -6104,6 +6104,7 @@ mysql_declare_plugin(binlog) 0x0100 /* 1.0 */, NULL, /* status variables */ NULL, /* system variables */ - NULL /* config options */ + NULL, /* config options */ + 0, } mysql_declare_plugin_end; === modified file 'sql/sql_lex.cc' --- a/sql/sql_lex.cc 2011-09-21 11:01:41 +0000 +++ b/sql/sql_lex.cc 2011-09-23 11:42:35 +0000 @@ -436,6 +436,7 @@ void lex_start(THD *thd) lex->is_lex_started= TRUE; lex->used_tables= 0; + lex->reset_slave_info.all= false; DBUG_VOID_RETURN; } No bundle (reason: useless for push emails).