MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alexander Nozdrin Date:February 17 2010 11:38am
Subject:bzr push into mysql-5.5-next-mr branch (alik:2963 to 2964)
View as plain text  
 2964 Alexander Nozdrin	2010-02-17
      Re-adding 'include/probes_mysql_nodtrace.h' removed by accident
      in 'kostja@stripped'.
      
      This file is necessary for Windows builds.

    added:
      include/probes_mysql_nodtrace.h
 2963 Alexander Barkov	2010-02-17 [merge]
      Merging from mysql-next-mr

    removed:
      include/probes_mysql_nodtrace.h
      mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result
      mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test
      mysql-test/t/partition_innodb-master.opt
    added:
      mysql-test/extra/binlog_tests/drop_table.test
      mysql-test/include/implicit_commit_helper.inc
      mysql-test/r/implicit_commit.result
      mysql-test/r/innodb_mysql_lock.result
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/merge_recover.result
      mysql-test/r/sp-lock.result
      mysql-test/r/truncate_coverage.result
      mysql-test/suite/binlog/r/binlog_row_drop_tbl.result
      mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result
      mysql-test/suite/binlog/t/binlog_row_drop_tbl.test
      mysql-test/suite/binlog/t/binlog_stm_drop_tbl.test
      mysql-test/suite/rpl/r/rpl_view_multi.result
      mysql-test/suite/rpl/t/rpl_view_multi.test
      mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result
      mysql-test/suite/sys_vars/t/lock_wait_timeout_basic.test
      mysql-test/t/implicit_commit.test
      mysql-test/t/innodb_mysql_lock-master.opt
      mysql-test/t/innodb_mysql_lock.test
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/merge_recover-master.opt
      mysql-test/t/merge_recover.test
      mysql-test/t/sp-lock.test
      mysql-test/t/truncate_coverage.test
      sql/mdl.cc
      sql/mdl.h
      sql/sql_plist.h
      sql/transaction.cc
      sql/transaction.h
    modified:
      .bzrignore
      client/Makefile.am
      include/my_base.h
      include/my_global.h
      include/my_pthread.h
      include/my_sys.h
      include/thr_lock.h
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
      mysql-test/extra/rpl_tests/rpl_innodb.test
      mysql-test/include/commit.inc
      mysql-test/include/handler.inc
      mysql-test/include/mix1.inc
      mysql-test/include/mix2.inc
      mysql-test/include/mtr_warnings.sql
      mysql-test/lib/v1/mtr_report.pl
      mysql-test/r/commit_1innodb.result
      mysql-test/r/create.result
      mysql-test/r/debug_sync.result
      mysql-test/r/drop.result
      mysql-test/r/drop_debug.result
      mysql-test/r/flush.result
      mysql-test/r/flush_block_commit.result
      mysql-test/r/flush_block_commit_notembedded.result
      mysql-test/r/flush_table.result
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/information_schema.result
      mysql-test/r/innodb-lock.result
      mysql-test/r/innodb.result
      mysql-test/r/innodb_mysql.result
      mysql-test/r/kill.result
      mysql-test/r/lock.result
      mysql-test/r/lock_multi.result
      mysql-test/r/lock_sync.result
      mysql-test/r/lowercase_table2.result
      mysql-test/r/merge.result
      mysql-test/r/mix2_myisam.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/not_embedded_server.result
      mysql-test/r/partition.result
      mysql-test/r/partition_column_prune.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_innodb_semi_consistent.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/partition_sync.result
      mysql-test/r/ps.result
      mysql-test/r/ps_ddl.result
      mysql-test/r/ps_ddl1.result
      mysql-test/r/repair.result
      mysql-test/r/schema.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp-threads.result
      mysql-test/r/sp.result
      mysql-test/r/trigger.result
      mysql-test/r/truncate.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/r/view_grant.result
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/binlog/t/binlog_stm_row.test
      mysql-test/suite/funcs_1/datadict/processlist_val.inc
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_val_ps.result
      mysql-test/suite/ndb/r/ndb_index_ordered.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_index_ordered.test
      mysql-test/suite/parts/r/partition_special_innodb.result
      mysql-test/suite/parts/t/partition_special_innodb.test
      mysql-test/suite/rpl/r/rpl_mixed_row_innodb.result
      mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_stm_innodb.result
      mysql-test/suite/rpl/r/rpl_stm_loadfile.result
      mysql-test/suite/rpl/r/rpl_trigger.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_killed_ddl.test
      mysql-test/suite/rpl/t/rpl_sp.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
      mysql-test/suite/sys_vars/r/autocommit_func.result
      mysql-test/suite/sys_vars/r/concurrent_insert_func.result
      mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result
      mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
      mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result
      mysql-test/suite/sys_vars/t/autocommit_func.test
      mysql-test/suite/sys_vars/t/concurrent_insert_func.test
      mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test
      mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test
      mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
      mysql-test/t/create.test
      mysql-test/t/debug_sync.test
      mysql-test/t/delayed.test
      mysql-test/t/disabled.def
      mysql-test/t/drop.test
      mysql-test/t/drop_debug.test
      mysql-test/t/flush.test
      mysql-test/t/flush_block_commit.test
      mysql-test/t/flush_block_commit_notembedded.test
      mysql-test/t/flush_table.test
      mysql-test/t/information_schema.test
      mysql-test/t/innodb-lock.test
      mysql-test/t/innodb.test
      mysql-test/t/insert_notembedded.test
      mysql-test/t/kill.test
      mysql-test/t/lock.test
      mysql-test/t/lock_multi.test
      mysql-test/t/lock_sync.test
      mysql-test/t/lowercase_table2.test
      mysql-test/t/merge-big.test
      mysql-test/t/merge.test
      mysql-test/t/multi_update.test
      mysql-test/t/not_embedded_server.test
      mysql-test/t/partition.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/partition_innodb_semi_consistent.test
      mysql-test/t/partition_sync.test
      mysql-test/t/ps.test
      mysql-test/t/ps_ddl.test
      mysql-test/t/ps_ddl1.test
      mysql-test/t/query_cache_28249.test
      mysql-test/t/read_only_innodb.test
      mysql-test/t/repair.test
      mysql-test/t/schema.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp.test
      mysql-test/t/sp_notembedded.test
      mysql-test/t/sp_sync.test
      mysql-test/t/status.test
      mysql-test/t/trigger.test
      mysql-test/t/trigger_notembedded.test
      mysql-test/t/truncate.test
      mysql-test/t/variables.test
      mysql-test/t/view.test
      mysql-test/t/view_grant.test
      mysql-test/t/xa.test
      mysys/hash.c
      mysys/my_static.c
      mysys/thr_lock.c
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/event_db_repository.cc
      sql/events.cc
      sql/field.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/lex.h
      sql/lock.cc
      sql/log.cc
      sql/log_event.cc
      sql/log_event_old.cc
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/rpl_injector.cc
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/set_var.cc
      sql/share/errmsg-utf8.txt
      sql/slave.cc
      sql/sp.cc
      sql/sp.h
      sql/sp_cache.cc
      sql/sp_cache.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_binlog.cc
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_cursor.cc
      sql/sql_db.cc
      sql/sql_delete.cc
      sql/sql_do.cc
      sql/sql_handler.cc
      sql/sql_help.cc
      sql/sql_insert.cc
      sql/sql_lex.h
      sql/sql_list.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_profile.cc
      sql/sql_profile.h
      sql/sql_rename.cc
      sql/sql_select.cc
      sql/sql_servers.cc
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_test.cc
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_udf.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/table.cc
      sql/table.h
      sql/tztime.cc
      storage/myisam/ha_myisam.cc
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/ha_myisammrg.h
      storage/myisammrg/myrg_extra.c
      storage/perfschema/pfs_engine_table.cc
      tests/mysql_client_test.c
      zlib/CMakeLists.txt
=== added file 'include/probes_mysql_nodtrace.h'
--- a/include/probes_mysql_nodtrace.h	1970-01-01 00:00:00 +0000
+++ b/include/probes_mysql_nodtrace.h	2010-02-17 11:37:55 +0000
@@ -0,0 +1,129 @@
+/*
+ * Generated by dheadgen(1).
+ */
+
+#ifndef	_PROBES_MYSQL_D
+#define	_PROBES_MYSQL_D
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	MYSQL_CONNECTION_START(arg0, arg1, arg2)
+#define	MYSQL_CONNECTION_START_ENABLED() (0)
+#define	MYSQL_CONNECTION_DONE(arg0, arg1)
+#define	MYSQL_CONNECTION_DONE_ENABLED() (0)
+#define	MYSQL_COMMAND_START(arg0, arg1, arg2, arg3)
+#define	MYSQL_COMMAND_START_ENABLED() (0)
+#define	MYSQL_COMMAND_DONE(arg0)
+#define	MYSQL_COMMAND_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_START(arg0, arg1, arg2, arg3, arg4)
+#define	MYSQL_QUERY_START_ENABLED() (0)
+#define	MYSQL_QUERY_DONE(arg0)
+#define	MYSQL_QUERY_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_PARSE_START(arg0)
+#define	MYSQL_QUERY_PARSE_START_ENABLED() (0)
+#define	MYSQL_QUERY_PARSE_DONE(arg0)
+#define	MYSQL_QUERY_PARSE_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_CACHE_HIT(arg0, arg1)
+#define	MYSQL_QUERY_CACHE_HIT_ENABLED() (0)
+#define	MYSQL_QUERY_CACHE_MISS(arg0)
+#define	MYSQL_QUERY_CACHE_MISS_ENABLED() (0)
+#define	MYSQL_QUERY_EXEC_START(arg0, arg1, arg2, arg3, arg4, arg5)
+#define	MYSQL_QUERY_EXEC_START_ENABLED() (0)
+#define	MYSQL_QUERY_EXEC_DONE(arg0)
+#define	MYSQL_QUERY_EXEC_DONE_ENABLED() (0)
+#define	MYSQL_INSERT_ROW_START(arg0, arg1)
+#define	MYSQL_INSERT_ROW_START_ENABLED() (0)
+#define	MYSQL_INSERT_ROW_DONE(arg0)
+#define	MYSQL_INSERT_ROW_DONE_ENABLED() (0)
+#define	MYSQL_UPDATE_ROW_START(arg0, arg1)
+#define	MYSQL_UPDATE_ROW_START_ENABLED() (0)
+#define	MYSQL_UPDATE_ROW_DONE(arg0)
+#define	MYSQL_UPDATE_ROW_DONE_ENABLED() (0)
+#define	MYSQL_DELETE_ROW_START(arg0, arg1)
+#define	MYSQL_DELETE_ROW_START_ENABLED() (0)
+#define	MYSQL_DELETE_ROW_DONE(arg0)
+#define	MYSQL_DELETE_ROW_DONE_ENABLED() (0)
+#define	MYSQL_READ_ROW_START(arg0, arg1, arg2)
+#define	MYSQL_READ_ROW_START_ENABLED() (0)
+#define	MYSQL_READ_ROW_DONE(arg0)
+#define	MYSQL_READ_ROW_DONE_ENABLED() (0)
+#define	MYSQL_INDEX_READ_ROW_START(arg0, arg1)
+#define	MYSQL_INDEX_READ_ROW_START_ENABLED() (0)
+#define	MYSQL_INDEX_READ_ROW_DONE(arg0)
+#define	MYSQL_INDEX_READ_ROW_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_RDLOCK_START(arg0, arg1)
+#define	MYSQL_HANDLER_RDLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_WRLOCK_START(arg0, arg1)
+#define	MYSQL_HANDLER_WRLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_UNLOCK_START(arg0, arg1)
+#define	MYSQL_HANDLER_UNLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_RDLOCK_DONE(arg0)
+#define	MYSQL_HANDLER_RDLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_WRLOCK_DONE(arg0)
+#define	MYSQL_HANDLER_WRLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_UNLOCK_DONE(arg0)
+#define	MYSQL_HANDLER_UNLOCK_DONE_ENABLED() (0)
+#define	MYSQL_FILESORT_START(arg0, arg1)
+#define	MYSQL_FILESORT_START_ENABLED() (0)
+#define	MYSQL_FILESORT_DONE(arg0, arg1)
+#define	MYSQL_FILESORT_DONE_ENABLED() (0)
+#define	MYSQL_SELECT_START(arg0)
+#define	MYSQL_SELECT_START_ENABLED() (0)
+#define	MYSQL_SELECT_DONE(arg0, arg1)
+#define	MYSQL_SELECT_DONE_ENABLED() (0)
+#define	MYSQL_INSERT_START(arg0)
+#define	MYSQL_INSERT_START_ENABLED() (0)
+#define	MYSQL_INSERT_DONE(arg0, arg1)
+#define	MYSQL_INSERT_DONE_ENABLED() (0)
+#define	MYSQL_INSERT_SELECT_START(arg0)
+#define	MYSQL_INSERT_SELECT_START_ENABLED() (0)
+#define	MYSQL_INSERT_SELECT_DONE(arg0, arg1)
+#define	MYSQL_INSERT_SELECT_DONE_ENABLED() (0)
+#define	MYSQL_UPDATE_START(arg0)
+#define	MYSQL_UPDATE_START_ENABLED() (0)
+#define	MYSQL_UPDATE_DONE(arg0, arg1, arg2)
+#define	MYSQL_UPDATE_DONE_ENABLED() (0)
+#define	MYSQL_MULTI_UPDATE_START(arg0)
+#define	MYSQL_MULTI_UPDATE_START_ENABLED() (0)
+#define	MYSQL_MULTI_UPDATE_DONE(arg0, arg1, arg2)
+#define	MYSQL_MULTI_UPDATE_DONE_ENABLED() (0)
+#define	MYSQL_DELETE_START(arg0)
+#define	MYSQL_DELETE_START_ENABLED() (0)
+#define	MYSQL_DELETE_DONE(arg0, arg1)
+#define	MYSQL_DELETE_DONE_ENABLED() (0)
+#define	MYSQL_MULTI_DELETE_START(arg0)
+#define	MYSQL_MULTI_DELETE_START_ENABLED() (0)
+#define	MYSQL_MULTI_DELETE_DONE(arg0, arg1)
+#define	MYSQL_MULTI_DELETE_DONE_ENABLED() (0)
+#define	MYSQL_NET_READ_START()
+#define	MYSQL_NET_READ_START_ENABLED() (0)
+#define	MYSQL_NET_READ_DONE(arg0, arg1)
+#define	MYSQL_NET_READ_DONE_ENABLED() (0)
+#define	MYSQL_NET_WRITE_START(arg0)
+#define	MYSQL_NET_WRITE_START_ENABLED() (0)
+#define	MYSQL_NET_WRITE_DONE(arg0)
+#define	MYSQL_NET_WRITE_DONE_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_START(arg0, arg1, arg2, arg3)
+#define	MYSQL_KEYCACHE_READ_START_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_BLOCK(arg0)
+#define	MYSQL_KEYCACHE_READ_BLOCK_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_HIT()
+#define	MYSQL_KEYCACHE_READ_HIT_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_MISS()
+#define	MYSQL_KEYCACHE_READ_MISS_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_DONE(arg0, arg1)
+#define	MYSQL_KEYCACHE_READ_DONE_ENABLED() (0)
+#define	MYSQL_KEYCACHE_WRITE_START(arg0, arg1, arg2, arg3)
+#define	MYSQL_KEYCACHE_WRITE_START_ENABLED() (0)
+#define	MYSQL_KEYCACHE_WRITE_BLOCK(arg0)
+#define	MYSQL_KEYCACHE_WRITE_BLOCK_ENABLED() (0)
+#define	MYSQL_KEYCACHE_WRITE_DONE(arg0, arg1)
+#define	MYSQL_KEYCACHE_WRITE_DONE_ENABLED() (0)
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  /* _PROBES_MYSQL_D */


Attachment: [text/bzr-bundle] bzr/alik@sun.com-20100217113755-s83ldxukauars9zx.bundle
Thread
bzr push into mysql-5.5-next-mr branch (alik:2963 to 2964)Alexander Nozdrin17 Feb