3090 Bjorn Munch 2011-07-15 [merge]
null upmerge
3089 Bjorn Munch 2011-07-15 [merge]
merge from trunk
removed:
storage/ndb/test/sql/
storage/ndb/test/sql/BANK.sql
storage/ndb/test/sql/T1.sql
storage/ndb/test/sql/test_create_drop.pl
storage/ndb/test/sql/test_range_bounds.pl
added:
mysql-test/include/explain_non_select.inc
mysql-test/include/explain_utils.inc
mysql-test/r/grant_explain_non_select.result
mysql-test/r/innodb_explain_non_select_all.result
mysql-test/r/innodb_explain_non_select_none.result
mysql-test/r/myisam_explain_non_select_all.result
mysql-test/r/myisam_explain_non_select_none.result
mysql-test/r/secure_file_priv_win.result
mysql-test/suite/rpl/r/rpl_row_corruption.result
mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt
mysql-test/suite/rpl/t/rpl_row_corruption.test
mysql-test/suite/sys_vars/inc/bin_relay_log_basename_index.inc
mysql-test/suite/sys_vars/r/log_bin_basename_basic.result
mysql-test/suite/sys_vars/r/log_bin_index_basic.result
mysql-test/suite/sys_vars/r/relay_log_basename_basic.result
mysql-test/suite/sys_vars/t/log_bin_basename_basic.test
mysql-test/suite/sys_vars/t/log_bin_index_basic.test
mysql-test/suite/sys_vars/t/relay_log_basename_basic.test
mysql-test/t/grant_explain_non_select.test
mysql-test/t/innodb_explain_non_select_all.test
mysql-test/t/innodb_explain_non_select_none.test
mysql-test/t/myisam_explain_non_select_all.test
mysql-test/t/myisam_explain_non_select_none.test
mysql-test/t/secure_file_priv_win-master.opt
mysql-test/t/secure_file_priv_win.test
mysys/psi_noop.cc
sql/opt_explain.cc
sql/opt_explain.h
modified:
client/mysqlbinlog.cc
client/mysqltest.cc
cmake/build_configurations/mysql_release.cmake
dbug/dbug.c
include/my_sys.h
include/mysql/plugin_audit.h
include/mysql/psi/mysql_file.h
include/mysql/psi/mysql_stage.h
include/mysql/psi/mysql_statement.h
include/mysql/psi/mysql_table.h
include/mysql/psi/mysql_thread.h
include/mysql/psi/psi.h
include/mysql/psi/psi_abi_v1.h.pp
include/probes_mysql_nodtrace.h
include/welcome_copyright_notice.h
libmysqld/lib_sql.cc
mysql-test/include/mix1.inc
mysql-test/include/subquery.inc
mysql-test/r/alter_table.result
mysql-test/r/ctype_utf16.result
mysql-test/r/explain.result
mysql-test/r/gis.result
mysql-test/r/grant.result
mysql-test/r/greedy_optimizer.result
mysql-test/r/information_schema.result
mysql-test/r/join_outer.result
mysql-test/r/join_outer_jcl6.result
mysql-test/r/partition_pruning.result
mysql-test/r/plugin_auth.result
mysql-test/r/sp-security.result
mysql-test/r/sp.result
mysql-test/r/subquery_all.result
mysql-test/r/subquery_all_jcl6.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_nomat_nosj_jcl6.result
mysql-test/r/subquery_none.result
mysql-test/r/subquery_none_jcl6.result
mysql-test/r/view.result
mysql-test/r/xml.result
mysql-test/suite/federated/federated.result
mysql-test/suite/innodb/r/innodb-index.result
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/innodb/t/innodb-index.test
mysql-test/suite/sys_vars/r/all_vars.result
mysql-test/suite/sys_vars/r/relay_log_index_basic.result
mysql-test/suite/sys_vars/t/all_vars.test
mysql-test/suite/sys_vars/t/relay_log_index_basic.test
mysql-test/t/alter_table.test
mysql-test/t/ctype_utf16.test
mysql-test/t/disabled.def
mysql-test/t/explain.test
mysql-test/t/gis.test
mysql-test/t/grant.test
mysql-test/t/greedy_optimizer.test
mysql-test/t/information_schema.test
mysql-test/t/partition_pruning.test
mysql-test/t/plugin_auth.test
mysql-test/t/sp-security.test
mysql-test/t/sp.test
mysql-test/t/view.test
mysql-test/t/xml.test
mysys/CMakeLists.txt
mysys/my_static.c
mysys/my_symlink.c
plugin/audit_null/audit_null.c
sql/CMakeLists.txt
sql/field.h
sql/field_conv.cc
sql/handler.cc
sql/item.cc
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_geofunc.cc
sql/item_subselect.cc
sql/item_sum.cc
sql/item_timefunc.cc
sql/item_xmlfunc.cc
sql/log_event.cc
sql/my_decimal.h
sql/mysqld.cc
sql/opt_range.cc
sql/opt_range.h
sql/partition_info.cc
sql/protocol.cc
sql/rpl_info_file.cc
sql/sp_head.cc
sql/sp_head.h
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_parse.h
sql/sql_partition.cc
sql/sql_priv.h
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_string.h
sql/sql_table.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.cc
storage/innobase/btr/btr0cur.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/os0file.h
storage/innobase/include/os0sync.ic
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0rw.ic
storage/innobase/include/sync0sync.ic
storage/innobase/lock/lock0lock.c
storage/innobase/row/row0row.c
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0rec.c
storage/perfschema/pfs.cc
storage/perfschema/pfs_instr.cc
storage/perfschema/pfs_instr.h
storage/perfschema/pfs_instr_class.cc
storage/perfschema/pfs_instr_class.h
storage/perfschema/pfs_setup_object.h
storage/perfschema/table_setup_consumers.cc
storage/perfschema/table_setup_consumers.h
storage/perfschema/table_setup_instruments.cc
storage/perfschema/table_setup_objects.cc
storage/perfschema/unittest/pfs-t.cc
storage/perfschema/unittest/pfs_instr_class-t.cc
support-files/mysql-log-rotate.sh
support-files/mysql.spec.sh
tests/mysql_client_test.c
unittest/gunit/my_decimal-t.cc
unittest/mysys/lf-t.c
3088 Bjorn Munch 2011-07-04
fix some commented-out debug prints after 11757216
modified:
mysql-test/lib/mtr_cases.pm
3087 Bjorn Munch 2011-07-04 [merge]
null upmerge
Diff too large for email (28275 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-mtr branch (bjorn.munch:3087 to 3090) | Bjorn Munch | 17 Jul |
