2746 Olav Sandstaa 2008-12-10
Post-merge fix for dTrace support
modified:
sql/probes.h
2745 Olav Sandstaa 2008-12-10 [merge]
Merge mysql-6.0-falcon-team -> mysql-6.0-falcon-ann
removed:
.bzr-mysql.moved/
.bzr-mysql.moved/default.conf
.cvsignore
BUILD/.cvsignore
BitKeeper/
BitKeeper/etc/
BitKeeper/etc/RESYNC_TREE
BitKeeper/etc/collapsed
BitKeeper/etc/config
BitKeeper/etc/gone
BitKeeper/etc/logging_ok
BitKeeper/etc/notify
BitKeeper/etc/skipkeys
BitKeeper/post-outgoing
BitKeeper/triggers/
BitKeeper/triggers/post-commit
BitKeeper/triggers/post-commit.innodb.pl
BitKeeper/triggers/post-incoming.innodb.pl
BitKeeper/triggers/pre-commit
BitKeeper/triggers/pre-commit.check-case.pl
BitKeeper/triggers/pre-commit.innodb.pl
BitKeeper/triggers/pre-delta
BitKeeper/triggers/pre-outgoing.crash-protect.pl
BitKeeper/triggers/pre-resolve.crash-protect.pl
BitKeeper/triggers/triggers-lib.pl
Docs/.cvsignore
client/.cvsignore
cmd-line-utils/readline/.cvsignore
extra/.cvsignore
include/.cvsignore
libmysql/.cvsignore
man/.cvsignore
mysql-test/suite/funcs_1/r/ndb_trig_0102.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_03.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_0407.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_08.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_09.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result.moved
mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved
mysys/.cvsignore
regex/.cvsignore
scripts/.cvsignore
sql/.cvsignore
sql/share/.cvsignore
storage/heap/.cvsignore
storage/myisam/.cvsignore
storage/myisammrg/.cvsignore
strings/.cvsignore
strings/ChangeLog
strings/bcopy-duff.c
strings/bzero.c
strings/macros.asm
strings/memcmp.c
strings/memcpy.c
strings/memset.c
strings/ptr_cmp.asm
strings/strcat.c
strings/strchr.c
strings/strcmp.c
strings/strings.asm
strings/strlen.c
strings/strrchr.c
strings/strxmov.asm
strings/udiv.c
support-files/.cvsignore
tests/.cvsignore
vio/.cvsignore
added:
mysql-test/r/csv_alter_table.result
mysql-test/r/ctype_filesystem.result
mysql-test/r/multi_update2.result
mysql-test/r/perror-win.result
mysql-test/r/timestamp_sysdate_is_now_func.result
mysql-test/suite/falcon/r/falcon_bug_29246.result
mysql-test/suite/falcon/r/falcon_bug_40994.result
mysql-test/suite/falcon/r/falcon_information_schema.result
mysql-test/suite/falcon/t/falcon_bug_22184-master.opt
mysql-test/suite/falcon/t/falcon_bug_29246.test
mysql-test/suite/falcon/t/falcon_bug_40994.test
mysql-test/suite/falcon/t/falcon_information_schema.test
mysql-test/t/ctype_filesystem-master.opt
mysql-test/t/ctype_filesystem.test
mysql-test/t/multi_update2-master.opt
mysql-test/t/multi_update2.test
mysql-test/t/perror-win.test
mysql-test/t/timestamp_sysdate_is_now_func-master.opt
mysql-test/t/timestamp_sysdate_is_now_func.test
sql/sql_prepare.h
storage/falcon/CompareAndSwapSparc.h
modified:
.bzrignore
client/mysql.cc
client/mysqlcheck.c
config/ac-macros/misc.m4
extra/perror.c
extra/yassl/include/cert_wrapper.hpp
extra/yassl/include/openssl/prefix_ssl.h
extra/yassl/include/openssl/ssl.h
extra/yassl/include/yassl_imp.hpp
extra/yassl/include/yassl_int.hpp
extra/yassl/include/yassl_types.hpp
extra/yassl/src/cert_wrapper.cpp
extra/yassl/src/ssl.cpp
extra/yassl/src/yassl_error.cpp
extra/yassl/src/yassl_imp.cpp
extra/yassl/src/yassl_int.cpp
include/m_string.h
include/my_dbug.h
include/my_global.h
include/my_sys.h
libmysql/libmysql.c
libmysql/libmysql.def
libmysqld/emb_qcache.cc
libmysqld/examples/CMakeLists.txt
libmysqld/lib_sql.cc
libmysqld/libmysqld.def
mysql-test/extra/rpl_tests/rpl_truncate_helper.test
mysql-test/include/check-testcase.test
mysql-test/mysql-test-run.pl
mysql-test/r/auto_commit_basic.result
mysql-test/r/automatic_sp_privileges_basic.result
mysql-test/r/big_tables_basic.result
mysql-test/r/create.result
mysql-test/r/ctype_utf8.result
mysql-test/r/debug_sync.result
mysql-test/r/engine_condition_pushdown_basic.result
mysql-test/r/events_bugs.result
mysql-test/r/events_scheduling.result
mysql-test/r/events_time_zone.result
mysql-test/r/federated.result
mysql-test/r/flush_basic.result
mysql-test/r/foreign_key_checks_basic.result
mysql-test/r/fulltext.result
mysql-test/r/func_compress.result
mysql-test/r/func_group.result
mysql-test/r/func_math.result
mysql-test/r/func_sapdb.result
mysql-test/r/func_str.result
mysql-test/r/general_log_basic.result
mysql-test/r/group_concat_max_len_func.result
mysql-test/r/implicit_commit.result
mysql-test/r/information_schema.result
mysql-test/r/information_schema_part.result
mysql-test/r/innodb_checksums_basic.result
mysql-test/r/innodb_doublewrite_basic.result
mysql-test/r/innodb_file_per_table_basic.result
mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result
mysql-test/r/innodb_mysql.result
mysql-test/r/innodb_rollback_on_timeout_basic.result
mysql-test/r/innodb_support_xa_basic.result
mysql-test/r/innodb_table_locks_basic.result
mysql-test/r/keep_files_on_create_basic.result
mysql-test/r/local_infile_basic.result
mysql-test/r/locktrans_innodb.result
mysql-test/r/locktrans_myisam.result
mysql-test/r/log_bin_trust_function_creators_basic.result
mysql-test/r/log_output_func.result
mysql-test/r/log_queries_not_using_indexes_basic.result
mysql-test/r/low_priority_updates_basic.result
mysql-test/r/max_allowed_packet_basic.result
mysql-test/r/max_allowed_packet_func.result
mysql-test/r/multi_update.result
mysql-test/r/myisam_use_mmap_basic.result
mysql-test/r/mysqlcheck.result
mysql-test/r/net_buffer_length_basic.result
mysql-test/r/new_basic.result
mysql-test/r/old_passwords_basic.result
mysql-test/r/openssl_1.result
mysql-test/r/packet.result
mysql-test/r/partition.result
mysql-test/r/partition_innodb.result
mysql-test/r/profiling.result
mysql-test/r/ps_1general.result
mysql-test/r/query_cache.result
mysql-test/r/query_cache_wlock_invalidate_basic.result
mysql-test/r/read_buffer_size_basic.result
mysql-test/r/read_only_basic.result
mysql-test/r/relay_log_purge_basic.result
mysql-test/r/rpl_slave_allow_batching_basic.result
mysql-test/r/rpl_slave_compressed_protocol_basic.result
mysql-test/r/secure_auth_basic.result
mysql-test/r/show_check.result
mysql-test/r/slow_query_log_basic.result
mysql-test/r/sp-vars.result
mysql-test/r/sql_auto_is_null_basic.result
mysql-test/r/sql_big_selects_basic.result
mysql-test/r/sql_big_tables_basic.result
mysql-test/r/sql_buffer_result_basic.result
mysql-test/r/sql_log_bin_basic.result
mysql-test/r/sql_log_off_basic.result
mysql-test/r/sql_low_priority_updates_basic.result
mysql-test/r/sql_notes_basic.result
mysql-test/r/sql_quote_show_create_basic.result
mysql-test/r/sql_safe_updates_basic.result
mysql-test/r/sql_warnings_basic.result
mysql-test/r/sync_frm_basic.result
mysql-test/r/timed_mutexes_basic.result
mysql-test/r/timestamp_func.result
mysql-test/r/timezone2.result
mysql-test/r/timezone3.result
mysql-test/r/type_newdecimal.result
mysql-test/r/type_varchar.result
mysql-test/r/union.result
mysql-test/r/unique_checks_basic.result
mysql-test/r/update.result
mysql-test/r/variables-notembedded.result
mysql-test/r/variables.result
mysql-test/r/view.result
mysql-test/r/wait_timeout_func.result
mysql-test/std_data/Moscow_leap
mysql-test/suite/backup/r/backup_backupdir.result
mysql-test/suite/backup/r/backup_db_grants.result
mysql-test/suite/backup/r/backup_errors.result
mysql-test/suite/backup/r/backup_lock_myisam.result
mysql-test/suite/backup/r/backup_views.result
mysql-test/suite/backup/t/backup_db_grants.test
mysql-test/suite/backup/t/backup_errors.test
mysql-test/suite/backup/t/backup_views.test
mysql-test/suite/backup/t/disabled.def
mysql-test/suite/binlog/t/disabled.def
mysql-test/suite/falcon/r/falcon_bug_22181.result
mysql-test/suite/falcon/r/falcon_bug_22184.result
mysql-test/suite/falcon/r/falcon_bug_28049.result
mysql-test/suite/falcon/r/falcon_bug_39708.result
mysql-test/suite/falcon/r/falcon_bugs.result
mysql-test/suite/falcon/t/disabled.def
mysql-test/suite/falcon/t/falcon_bug_22181.test
mysql-test/suite/falcon/t/falcon_bug_22184.test
mysql-test/suite/falcon/t/falcon_bug_39708-master.opt
mysql-test/suite/falcon/t/falcon_bug_39708.test
mysql-test/suite/falcon/t/falcon_bugs.test
mysql-test/suite/funcs_1/datadict/is_tables.inc
mysql-test/suite/funcs_1/r/falcon_func_view.result
mysql-test/suite/funcs_1/r/falcon_views.result
mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_views.result
mysql-test/suite/funcs_1/r/is_character_sets.result
mysql-test/suite/funcs_1/r/is_collation_charset_applic.result
mysql-test/suite/funcs_1/r/is_collations.result
mysql-test/suite/funcs_1/r/is_columns.result
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_schemata.result
mysql-test/suite/funcs_1/r/is_tables.result
mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/memory_views.result
mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/r/ndb_func_view.result
mysql-test/suite/funcs_1/r/ndb_views.result
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
mysql-test/suite/rpl/r/rpl_truncate_falcon.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
mysql-test/t/auto_commit_basic.test
mysql-test/t/automatic_sp_privileges_basic.test
mysql-test/t/big_tables_basic.test
mysql-test/t/ctype_utf8.test
mysql-test/t/disabled.def
mysql-test/t/engine_condition_pushdown_basic.test
mysql-test/t/events_bugs.test
mysql-test/t/events_scheduling.test
mysql-test/t/events_time_zone.test
mysql-test/t/federated.test
mysql-test/t/federated_innodb.test
mysql-test/t/flush_basic.test
mysql-test/t/foreign_key_checks_basic.test
mysql-test/t/fulltext.test
mysql-test/t/func_compress.test
mysql-test/t/func_group.test
mysql-test/t/func_sapdb.test
mysql-test/t/general_log_basic.test
mysql-test/t/group_concat_max_len_func.test
mysql-test/t/implicit_commit.test
mysql-test/t/information_schema.test
mysql-test/t/information_schema_part.test
mysql-test/t/innodb_bug34300.test
mysql-test/t/innodb_checksums_basic.test
mysql-test/t/innodb_doublewrite_basic.test
mysql-test/t/innodb_file_per_table_basic.test
mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test
mysql-test/t/innodb_mysql.test
mysql-test/t/innodb_rollback_on_timeout_basic.test
mysql-test/t/innodb_support_xa_basic.test
mysql-test/t/innodb_table_locks_basic.test
mysql-test/t/keep_files_on_create_basic.test
mysql-test/t/local_infile_basic.test
mysql-test/t/log_bin_trust_function_creators_basic.test
mysql-test/t/log_output_func.test
mysql-test/t/log_queries_not_using_indexes_basic.test
mysql-test/t/low_priority_updates_basic.test
mysql-test/t/max_allowed_packet_basic.test
mysql-test/t/max_allowed_packet_func.test
mysql-test/t/multi_update.test
mysql-test/t/myisam_use_mmap_basic.test
mysql-test/t/mysqlcheck.test
mysql-test/t/net_buffer_length_basic.test
mysql-test/t/new_basic.test
mysql-test/t/old_passwords_basic.test
mysql-test/t/openssl_1.test
mysql-test/t/packet.test
mysql-test/t/partition.test
mysql-test/t/partition_innodb.test
mysql-test/t/perror.test
mysql-test/t/query_cache_wlock_invalidate_basic.test
mysql-test/t/read_only_basic.test
mysql-test/t/relay_log_purge_basic.test
mysql-test/t/rpl_slave_allow_batching_basic.test
mysql-test/t/rpl_slave_compressed_protocol_basic.test
mysql-test/t/secure_auth_basic.test
mysql-test/t/show_check.test
mysql-test/t/slow_query_log_basic.test
mysql-test/t/sp-vars.test
mysql-test/t/sql_auto_is_null_basic.test
mysql-test/t/sql_big_selects_basic.test
mysql-test/t/sql_big_tables_basic.test
mysql-test/t/sql_buffer_result_basic.test
mysql-test/t/sql_log_bin_basic.test
mysql-test/t/sql_log_off_basic.test
mysql-test/t/sql_low_priority_updates_basic.test
mysql-test/t/sql_notes_basic.test
mysql-test/t/sql_quote_show_create_basic.test
mysql-test/t/sql_safe_updates_basic.test
mysql-test/t/sql_warnings_basic.test
mysql-test/t/subselect.test
mysql-test/t/sync_frm_basic.test
mysql-test/t/timed_mutexes_basic.test
mysql-test/t/timestamp_func.test
mysql-test/t/timezone3.test
mysql-test/t/type_newdecimal.test
mysql-test/t/type_varchar.test
mysql-test/t/union.test
mysql-test/t/unique_checks_basic.test
mysql-test/t/update.test
mysql-test/t/variables-notembedded.test
mysql-test/t/variables.test
mysql-test/t/view.test
mysql-test/t/wait_timeout_func.test
mysys/mf_tempdir.c
mysys/my_getopt.c
mysys/my_thr_init.c
scripts/Makefile.am
scripts/mysql_config.pl.in
scripts/mysql_config.sh
sql/Makefile.am
sql/backup/backup_aux.h
sql/backup/backup_info.cc
sql/backup/backup_info.h
sql/backup/backup_test.cc
sql/backup/image_info.h
sql/backup/kernel.cc
sql/backup/logger.cc
sql/debug_sync.cc
sql/event_data_objects.cc
sql/event_scheduler.cc
sql/events.cc
sql/field.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_func.cc
sql/item_func.h
sql/item_timefunc.cc
sql/item_timefunc.h
sql/log.cc
sql/log_event.cc
sql/log_event_old.cc
sql/my_decimal.cc
sql/mysql_priv.h
sql/mysql_priv.h.pp
sql/mysqld.cc
sql/nt_servc.cc
sql/nt_servc.h
sql/parse_file.cc
sql/parse_file.h
sql/probes.h
sql/protocol.cc
sql/protocol.h
sql/rpl_rli.cc
sql/set_var.cc
sql/set_var.h
sql/share/errmsg.txt
sql/si_objects.cc
sql/si_objects.h
sql/slave.cc
sql/slave.h
sql/sp.cc
sql/sp_head.cc
sql/sp_rcontext.cc
sql/sp_rcontext.h
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_db.cc
sql/sql_derived.cc
sql/sql_error.cc
sql/sql_error.h
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_list.cc
sql/sql_list.h
sql/sql_load.cc
sql/sql_manager.cc
sql/sql_parse.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_servers.cc
sql/sql_show.cc
sql/sql_string.h
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_udf.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.cc
sql/table.h
sql/thr_malloc.cc
sql/time.cc
sql/transaction.cc
sql/tztime.cc
sql/tztime.h
sql/unireg.cc
storage/csv/ha_tina.cc
storage/falcon/CompareAndSwapSparc.il
storage/falcon/DataPage.cpp
storage/falcon/Interlock.h
storage/falcon/Makefile.am
storage/falcon/MySQLCollation.cpp
storage/falcon/StorageTable.cpp
storage/falcon/StorageVersion.h
storage/falcon/ha_falcon.cpp
storage/falcon/plug.in
storage/innobase/handler/ha_innodb.cc
storage/maria/CMakeLists.txt
tests/mysql_client_test.c
=== modified file 'sql/probes.h'
=== modified file 'sql/probes.h'
--- a/sql/probes.h 2008-12-10 13:26:53 +0000
+++ b/sql/probes.h 2008-12-10 17:20:30 +0000
@@ -11,7 +11,7 @@
extern "C" {
#endif
-#if _DTRACE_VERSION
+#if _DTRACE_VERSION && defined(HAVE_DTRACE)
#define MYSQL_COMMAND_DONE(arg0) \
__dtrace_mysql___command__done(arg0)
| Thread |
|---|
| • bzr push into mysql-6.0-falcon-ann branch (olav:2745 to 2746) | Olav Sandstaa | 10 Dec |
