MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:He Zhenxing Date:June 12 2009 3:48am
Subject:bzr commit into mysql-azalea branch (zhenxing.he:3355)
View as plain text  
#At file:///media/sdb2/hezx/work/mysql/bzrwork/merge/azalea/ based on revid:alik@strippedbodnx9

 3355 He Zhenxing	2009-06-12 [merge]
      Merge 6.0-rpl to azalea

    A  mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
    A  mysql-test/include/show_relaylog_events.inc
    A  mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
    A  mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
    A  mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
    A  mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
    M  .bzr-mysql/default.conf
    M  dbug/dbug.c
    M  include/my_dbug.h
    M  mysql-test/include/show_binlog_events.inc
    M  mysql-test/r/debug_sync.result
    M  mysql-test/r/events_bugs.result
    M  mysql-test/r/grant2.result
    M  mysql-test/r/information_schema_db.result
    M  mysql-test/r/mysqldump.result
    M  mysql-test/r/sp-security.result
    M  mysql-test/r/trigger_notembedded.result
    M  mysql-test/r/view_grant.result
    M  mysql-test/suite/backup/r/backup_security.result
    M  mysql-test/suite/binlog/r/binlog_grant.result
    M  mysql-test/suite/federated/federated_server.result
    M  mysql-test/suite/funcs_1/r/innodb_trig_03e.result
    M  mysql-test/suite/funcs_1/r/memory_trig_03e.result
    M  mysql-test/suite/funcs_1/r/myisam_trig_03e.result
    M  mysql-test/suite/funcs_1/r/ndb_trig_03e.result
    M  mysql-test/suite/rpl/r/rpl_temporary.result
    M  mysql-test/suite/sys_vars/r/read_only_func.result
    M  sql/lex.h
    M  sql/mysql_priv.h
    M  sql/mysqld.cc
    M  sql/share/errmsg.txt
    M  sql/slave.cc
    M  sql/sp_head.cc
    M  sql/sql_acl.cc
    M  sql/sql_acl.h
    M  sql/sql_class.cc
    M  sql/sql_class.h
    M  sql/sql_lex.h
    M  sql/sql_parse.cc
    M  sql/sql_partition.cc
    M  sql/sql_repl.cc
    M  sql/sql_yacc.yy
    2599.149.14 He Zhenxing	2009-06-12 [merge]
                Auto merge from azalea

        D  mysql-test/include/diff_tables.inc
        A  mysql-test/include/diff_tables.inc
        A  mysql-test/include/mysqldump.inc
        A  mysql-test/include/no_valgrind_without_big.inc
        A  mysql-test/r/mysqldump_restore.result
        A  mysql-test/r/sp-fib.result
        A  mysql-test/suite/binlog/r/binlog_incident.result
        A  mysql-test/suite/binlog/r/binlog_tbl_metadata.result
        A  mysql-test/suite/binlog/t/binlog_incident-master.opt
        A  mysql-test/suite/binlog/t/binlog_incident.test
        A  mysql-test/suite/binlog/t/binlog_tbl_metadata.test
        A  mysql-test/suite/ibmdb2i/include/have_i54.inc
        A  mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result
        A  mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result
        A  mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test
        A  mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test
        A  mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
        A  mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
        A  mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
        A  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
        A  mysql-test/t/mysqldump_restore.test
        A  mysql-test/t/sp-fib.test
        M  client/mysql.cc
        M  client/mysql_upgrade.c
        M  client/mysqladmin.cc
        M  client/mysqlbinlog.cc
        M  client/mysqlcheck.c
        M  client/mysqldump.c
        M  client/mysqlimport.c
        M  client/mysqlshow.c
        M  client/mysqlslap.c
        M  client/mysqltest.cc
        M  cmd-line-utils/readline/bind.c
        M  cmd-line-utils/readline/chardefs.h
        M  cmd-line-utils/readline/display.c
        M  dbug/user.r
        M  extra/innochecksum.c
        M  extra/perror.c
        M  include/my_sys.h
        M  include/violite.h
        M  mysql-test/Makefile.am
        M  mysql-test/collections/default.push
        M  mysql-test/include/concurrent.inc
        M  mysql-test/include/grant_cache.inc
        M  mysql-test/include/handler.inc
        M  mysql-test/include/mix1.inc
        M  mysql-test/include/query_cache.inc
        M  mysql-test/lib/My/SafeProcess/safe_process_win.cc
        M  mysql-test/lib/mtr_cases.pm
        M  mysql-test/lib/mtr_report.pm
        M  mysql-test/mysql-test-run.pl
        M  mysql-test/r/cast.result
        M  mysql-test/r/concurrent_innodb_safelog.result
        M  mysql-test/r/concurrent_innodb_unsafelog.result
        M  mysql-test/r/consistent_snapshot.result
        M  mysql-test/r/ctype_cp932_binlog_row.result
        M  mysql-test/r/ctype_cp932_binlog_stm.result
        M  mysql-test/r/ctype_ldml.result
        M  mysql-test/r/ctype_sjis.result
        M  mysql-test/r/ddl_i18n_koi8r.result
        M  mysql-test/r/ddl_i18n_utf8.result
        M  mysql-test/r/debug_sync.result
        M  mysql-test/r/distinct.result
        M  mysql-test/r/events_bugs.result
        M  mysql-test/r/events_stress.result
        M  mysql-test/r/func_compress.result
        M  mysql-test/r/func_concat.result
        M  mysql-test/r/func_crypt.result
        M  mysql-test/r/func_in.result
        M  mysql-test/r/func_math.result
        M  mysql-test/r/func_sapdb.result
        M  mysql-test/r/func_str.result
        M  mysql-test/r/func_time.result
        M  mysql-test/r/grant.result
        M  mysql-test/r/grant_cache_no_prot.result
        M  mysql-test/r/grant_cache_ps_prot.result
        M  mysql-test/r/heap_btree.result
        M  mysql-test/r/information_schema_db.result
        M  mysql-test/r/innodb_mysql.result
        M  mysql-test/r/insert_select.result
        M  mysql-test/r/locktrans_innodb.result
        M  mysql-test/r/locktrans_myisam.result
        M  mysql-test/r/mysql.result
        M  mysql-test/r/mysqlbinlog.result
        M  mysql-test/r/mysqldump.result
        M  mysql-test/r/mysqltest.result
        M  mysql-test/r/openssl_1.result
        M  mysql-test/r/shm.result
        M  mysql-test/r/signal.result
        M  mysql-test/r/signal_demo3.result
        M  mysql-test/r/sp-error.result
        M  mysql-test/r/sp.result
        M  mysql-test/r/sp_notembedded.result
        M  mysql-test/r/sp_trans_log.result
        M  mysql-test/r/status.result
        M  mysql-test/r/subselect3.result
        M  mysql-test/r/subselect3_jcl6.result
        M  mysql-test/r/type_date.result
        M  mysql-test/r/type_time.result
        M  mysql-test/r/union.result
        M  mysql-test/r/user_var.result
        M  mysql-test/r/variables.result
        M  mysql-test/r/view.result
        M  mysql-test/r/xa.result
        M  mysql-test/suite/backup/r/backup_db_grants.result
        M  mysql-test/suite/backup/r/backup_external_non_win.result
        M  mysql-test/suite/backup_engines/combinations
        M  mysql-test/suite/binlog/r/binlog_database.result
        M  mysql-test/suite/binlog/r/binlog_implicit_commit.result
        M  mysql-test/suite/binlog/r/binlog_innodb.result
        M  mysql-test/suite/binlog/r/binlog_innodb_row.result
        M  mysql-test/suite/binlog/r/binlog_multi_engine.result
        M  mysql-test/suite/binlog/r/binlog_row_binlog.result
        M  mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
        M  mysql-test/suite/binlog/r/binlog_row_drop_tbl.result
        M  mysql-test/suite/binlog/r/binlog_row_insert_select.result
        M  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
        M  mysql-test/suite/binlog/r/binlog_stm_binlog.result
        M  mysql-test/suite/binlog/r/binlog_stm_blackhole.result
        M  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
        M  mysql-test/suite/binlog/r/binlog_stm_ps.result
        M  mysql-test/suite/binlog/r/binlog_stm_row.result
        M  mysql-test/suite/binlog/r/binlog_unsafe.result
        M  mysql-test/suite/binlog/t/binlog_unsafe.test
        M  mysql-test/suite/funcs_1/datadict/charset_collation.inc
        M  mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
        M  mysql-test/suite/funcs_1/datadict/is_routines.inc
        M  mysql-test/suite/funcs_1/datadict/is_schemata.inc
        M  mysql-test/suite/funcs_1/datadict/is_tables.inc
        M  mysql-test/suite/funcs_1/datadict/is_triggers.inc
        M  mysql-test/suite/funcs_1/datadict/is_views.inc
        M  mysql-test/suite/funcs_1/datadict/processlist_priv.inc
        M  mysql-test/suite/funcs_1/datadict/statistics.inc
        M  mysql-test/suite/funcs_1/datadict/table_constraints.inc
        M  mysql-test/suite/funcs_1/datadict/tables.inc
        M  mysql-test/suite/funcs_1/datadict/tables1.inc
        M  mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
        M  mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
        M  mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
        M  mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
        M  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
        M  mysql-test/suite/funcs_1/t/is_basics_mixed.test
        M  mysql-test/suite/funcs_1/t/is_column_privileges.test
        M  mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
        M  mysql-test/suite/funcs_1/t/is_columns.test
        M  mysql-test/suite/funcs_1/t/is_schema_privileges.test
        M  mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
        M  mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
        M  mysql-test/suite/funcs_1/t/is_statistics.test
        M  mysql-test/suite/funcs_1/t/is_table_constraints.test
        M  mysql-test/suite/funcs_1/t/is_table_privileges.test
        M  mysql-test/suite/funcs_1/t/is_user_privileges.test
        M  mysql-test/suite/funcs_1/t/myisam_views.test
        M  mysql-test/suite/funcs_1/t/storedproc.test
        M  mysql-test/suite/funcs_1/triggers/triggers_03.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_0407.inc
        M  mysql-test/suite/funcs_1/triggers/triggers_08.inc
        M  mysql-test/suite/ndb/my.cnf
        M  mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
        M  mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
        M  mysql-test/suite/rpl/r/rpl_binlog_grant.result
        M  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
        M  mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
        M  mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
        M  mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
        M  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
        M  mysql-test/suite/rpl/r/rpl_row_create_table.result
        M  mysql-test/suite/rpl/r/rpl_row_log.result
        M  mysql-test/suite/rpl/r/rpl_row_log_innodb.result
        M  mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
        M  mysql-test/suite/rpl/r/rpl_slave_skip.result
        M  mysql-test/suite/rpl/r/rpl_stm_loadfile.result
        M  mysql-test/suite/rpl/r/rpl_temporary.result
        M  mysql-test/suite/rpl/r/rpl_udf.result
        M  mysql-test/suite/rpl/t/disabled.def
        M  mysql-test/suite/rpl/t/rpl_incident.test
        M  mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
        M  mysql-test/suite/rpl/t/rpl_temporary.test
        M  mysql-test/suite/rpl_ndb_big/r/rpl_ndb_stm_innodb.result
        M  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2other-slave.opt
        M  mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result
        M  mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result
        M  mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
        M  mysql-test/suite/sys_vars/r/ssl_capath_basic.result
        M  mysql-test/suite/sys_vars/r/ssl_cipher_basic.result
        M  mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test
        M  mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test
        M  mysql-test/suite/sys_vars/t/ssl_capath_basic.test
        M  mysql-test/suite/sys_vars/t/ssl_cipher_basic.test
        M  mysql-test/t/archive_bitfield.test
        M  mysql-test/t/cast.test
        M  mysql-test/t/client_xml.test
        M  mysql-test/t/connect.test
        M  mysql-test/t/consistent_snapshot.test
        M  mysql-test/t/count_distinct3.test
        M  mysql-test/t/csv.test
        M  mysql-test/t/ctype_cp932_binlog_stm.test
        M  mysql-test/t/ctype_ldml.test
        M  mysql-test/t/ctype_sjis.test
        M  mysql-test/t/ddl_i18n_koi8r.test
        M  mysql-test/t/ddl_i18n_utf8.test
        M  mysql-test/t/derived.test
        M  mysql-test/t/disabled.def
        M  mysql-test/t/drop.test
        M  mysql-test/t/events_grant.test
        M  mysql-test/t/events_stress.test
        M  mysql-test/t/events_trans_notembedded.test
        M  mysql-test/t/fix_priv_tables.test
        M  mysql-test/t/flush.test
        M  mysql-test/t/func_compress.test
        M  mysql-test/t/func_concat.test
        M  mysql-test/t/func_crypt.test
        M  mysql-test/t/func_in.test
        M  mysql-test/t/func_math.test
        M  mysql-test/t/func_str.test
        M  mysql-test/t/grant.test
        M  mysql-test/t/heap_btree.test
        M  mysql-test/t/information_schema_db.test
        M  mysql-test/t/innodb_mysql.test
        M  mysql-test/t/insert_select.test
        M  mysql-test/t/lowercase_fs_off.test
        M  mysql-test/t/multi_update2.test
        M  mysql-test/t/mysql.test
        M  mysql-test/t/mysqlbinlog.test
        M  mysql-test/t/mysqldump.test
        M  mysql-test/t/mysqltest.test
        M  mysql-test/t/named_pipe.test
        M  mysql-test/t/openssl_1.test
        M  mysql-test/t/shm.test
        M  mysql-test/t/sp-error.test
        M  mysql-test/t/sp.test
        M  mysql-test/t/sp_notembedded.test
        M  mysql-test/t/status.test
        M  mysql-test/t/subselect3.test
        M  mysql-test/t/type_date.test
        M  mysql-test/t/type_time.test
        M  mysql-test/t/union.test
        M  mysql-test/t/user_var.test
        M  mysql-test/t/variables.test
        M  mysql-test/t/view.test
        M  mysql-test/t/xa.test
        M  mysys/mf_format.c
        M  mysys/mf_getdate.c
        M  mysys/my_getopt.c
        M  scripts/mysql_convert_table_format.sh
        M  scripts/mysql_zap.sh
        M  scripts/mysqld_multi.sh
        M  scripts/mysqld_safe.sh
        M  scripts/mysqldumpslow.sh
        M  sql-common/client.c
        M  sql/field.cc
        M  sql/field_conv.cc
        M  sql/gstream.cc
        M  sql/ha_ndbcluster_binlog.cc
        M  sql/handler.cc
        M  sql/item.cc
        M  sql/item.h
        M  sql/item_cmpfunc.cc
        M  sql/item_func.cc
        M  sql/item_func.h
        M  sql/item_strfunc.cc
        M  sql/item_strfunc.h
        M  sql/item_subselect.cc
        M  sql/item_sum.cc
        M  sql/item_timefunc.cc
        M  sql/item_timefunc.h
        M  sql/log.cc
        M  sql/log.h
        M  sql/log_event.cc
        M  sql/log_event.h
        M  sql/mysql_priv.h
        M  sql/mysqld.cc
        M  sql/opt_range.cc
        M  sql/opt_sum.cc
        M  sql/password.c
        M  sql/rpl_rli.cc
        M  sql/set_var.cc
        M  sql/share/errmsg.txt
        M  sql/slave.cc
        M  sql/sp.cc
        M  sql/sp.h
        M  sql/sp_head.cc
        M  sql/sql_acl.cc
        M  sql/sql_acl.h
        M  sql/sql_base.cc
        M  sql/sql_class.cc
        M  sql/sql_class.h
        M  sql/sql_connect.cc
        M  sql/sql_db.cc
        M  sql/sql_delete.cc
        M  sql/sql_derived.cc
        M  sql/sql_handler.cc
        M  sql/sql_insert.cc
        M  sql/sql_lex.cc
        M  sql/sql_lex.h
        M  sql/sql_load.cc
        M  sql/sql_parse.cc
        M  sql/sql_plugin.cc
        M  sql/sql_plugin.h
        M  sql/sql_prepare.cc
        M  sql/sql_prepare.h
        M  sql/sql_rename.cc
        M  sql/sql_repl.cc
        M  sql/sql_select.cc
        M  sql/sql_string.cc
        M  sql/sql_table.cc
        M  sql/sql_union.cc
        M  sql/sql_update.cc
        M  sql/sql_view.cc
        M  sql/sql_yacc.yy
        M  sql/table.cc
        M  sql/unireg.cc
        M  storage/ibmdb2i/db2i_charsetSupport.cc
        M  storage/ibmdb2i/db2i_conversion.cc
        M  storage/ibmdb2i/db2i_errors.cc
        M  storage/ibmdb2i/db2i_errors.h
        M  storage/ibmdb2i/db2i_misc.h
        M  storage/ibmdb2i/ha_ibmdb2i.cc
        M  storage/ibmdb2i/ha_ibmdb2i.h
        M  storage/innobase/dict/dict0dict.c
        M  storage/myisam/ha_myisam.cc
        M  storage/myisam/myisamchk.c
        M  storage/myisammrg/ha_myisammrg.cc
        M  storage/ndb/src/kernel/blocks/backup/read.cpp
        M  strings/ctype-cp932.c
        M  strings/ctype-sjis.c
        M  strings/ctype-uca.c
        M  tests/mysql_client_test.c
        M  vio/vio.c
        M  vio/vio_priv.h
        M  vio/viosocket.c
    2599.149.13 He Zhenxing	2009-06-12 [merge]
                Auto merge from azalea to rpl

        D  mysql-test/suite/im/
        D  mysql-test/suite/im/r/
        D  mysql-test/suite/im/r/im_cmd_line.result
        D  mysql-test/suite/im/r/im_daemon_life_cycle.result
        D  mysql-test/suite/im/r/im_instance_conf.result
        D  mysql-test/suite/im/r/im_life_cycle.result
        D  mysql-test/suite/im/r/im_options.result
        D  mysql-test/suite/im/r/im_utils.result
        D  mysql-test/suite/im/t/
        D  mysql-test/suite/im/t/disabled.def
        D  mysql-test/suite/im/t/im_check_env.inc
        D  mysql-test/suite/im/t/im_cmd_line.imtest
        D  mysql-test/suite/im/t/im_daemon_life_cycle-im.opt
        D  mysql-test/suite/im/t/im_daemon_life_cycle.imtest
        D  mysql-test/suite/im/t/im_instance_conf-im.opt
        D  mysql-test/suite/im/t/im_instance_conf.imtest
        D  mysql-test/suite/im/t/im_life_cycle-im.opt
        D  mysql-test/suite/im/t/im_life_cycle.imtest
        D  mysql-test/suite/im/t/im_options-im.opt
        D  mysql-test/suite/im/t/im_options.imtest
        D  mysql-test/suite/im/t/im_utils-im.opt
        D  mysql-test/suite/im/t/im_utils.imtest
        D  mysql-test/suite/im/t/kill_n_check.sh
        D  mysql-test/suite/im/t/log.sh
        D  mysql-test/suite/im/t/utils.sh
        D  mysql-test/suite/im/t/wait_for_process.sh
        D  mysql-test/suite/im/t/wait_for_socket.sh
        M  mysql-test/suite/parts/t/disabled.def
        M  mysql-test/suite/rpl/t/disabled.def
        M  mysql-test/t/disabled.def
    2599.149.12 He Zhenxing	2009-06-08 [merge]
                Auto merge azalea to rpl tree

        D  mysql-test/include/have_utf16.inc
        D  mysql-test/include/have_utf32.inc
        D  mysql-test/r/ctype_utf16.result
        D  mysql-test/r/ctype_utf16_uca.result
        D  mysql-test/r/ctype_utf32.result
        D  mysql-test/r/ctype_utf32_uca.result
        D  mysql-test/r/have_utf16.require
        D  mysql-test/r/have_utf32.require
        D  mysql-test/r/signal_utf32.result
        D  mysql-test/t/ctype_utf16.test
        D  mysql-test/t/ctype_utf16_uca.test
        D  mysql-test/t/ctype_utf32.test
        D  mysql-test/t/ctype_utf32_uca.test
        D  mysql-test/t/signal_utf32.test
        M  config/ac-macros/character_sets.m4
        M  include/config-win.h
        M  include/m_ctype.h
        M  mysql-test/r/ctype_ldml.result
        M  mysql-test/r/ctype_uca.result
        M  mysql-test/r/ctype_utf8.result
        M  mysql-test/r/group_by.result
        M  mysql-test/r/information_schema_parameters.result
        M  mysql-test/r/information_schema_routines.result
        M  mysql-test/r/innodb.result
        M  mysql-test/r/innodb_ctype_ldml.result
        M  mysql-test/r/innodb_mysql.result
        M  mysql-test/r/join.result
        M  mysql-test/r/myisam.result
        M  mysql-test/r/mysqlbinlog_row.result
        M  mysql-test/r/mysqlbinlog_row_innodb.result
        M  mysql-test/r/mysqlbinlog_row_myisam.result
        M  mysql-test/r/show_check.result
        M  mysql-test/suite/funcs_1/r/is_columns.result
        M  mysql-test/suite/funcs_1/r/is_columns_is.result
        M  mysql-test/suite/funcs_1/r/is_columns_mysql.result
        M  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
        M  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
        M  mysql-test/t/ctype_ldml.test
        M  mysql-test/t/ctype_uca.test
        M  mysql-test/t/ctype_utf8.test
        M  mysql-test/t/innodb.test
        M  mysql-test/t/innodb_ctype_ldml.test
        M  mysys/charset-def.c
        M  mysys/charset.c
        M  sql/sql_plugin.cc
        M  strings/ctype-uca.c
        M  strings/ctype-ucs2.c
        M  strings/ctype-utf8.c
    2599.149.11 He Zhenxing	2009-06-03 [merge]
                Auto merge from azalea main

        D  mysql-test/suite/backup/r/backup_vp_nontx.result
        D  mysql-test/suite/backup/t/backup_vp_nontx.test
        A  mysql-test/collections/backup.rqg-daily
        A  mysql-test/collections/mysql-6.0-backup.push
        A  mysql-test/r/backup_disabled.result
        A  mysql-test/suite/backup/include/backup_image_path.inc
        A  mysql-test/suite/backup/include/backup_vp_nontx.inc
        A  mysql-test/suite/backup/my.cnf
        A  mysql-test/suite/backup/r/backup_backupdir_not_windows.result
        A  mysql-test/suite/backup/r/backup_backupdir_sync.result
        A  mysql-test/suite/backup/r/backup_check_i_s.result
        A  mysql-test/suite/backup/r/backup_general_log.result
        A  mysql-test/suite/backup/r/backup_image_path_nonwin.result
        A  mysql-test/suite/backup/r/backup_image_path_win.result
        A  mysql-test/suite/backup/r/backup_lock_conflict.result
        A  mysql-test/suite/backup/r/backup_vp_nontx_memory.result
        A  mysql-test/suite/backup/r/backup_vp_nontx_myisam.result
        A  mysql-test/suite/backup/t/backup_backupdir_not_windows.test
        A  mysql-test/suite/backup/t/backup_backupdir_sync.test
        A  mysql-test/suite/backup/t/backup_check_i_s.test
        A  mysql-test/suite/backup/t/backup_general_log.test
        A  mysql-test/suite/backup/t/backup_image_path_nonwin.test
        A  mysql-test/suite/backup/t/backup_image_path_win.test
        A  mysql-test/suite/backup/t/backup_lock_conflict.test
        A  mysql-test/suite/backup/t/backup_vp_nontx_memory.test
        A  mysql-test/suite/backup/t/backup_vp_nontx_myisam.test
        A  mysql-test/suite/backup_engines/my.cnf
        A  mysql-test/suite/backup_extra/README
        A  mysql-test/suite/backup_extra/include/check-objects.sql
        A  mysql-test/suite/backup_extra/include/objects.grammar
        A  mysql-test/suite/backup_extra/my.cnf
        A  mysql-test/suite/backup_extra/t/backup_object_coverage.test
        A  mysql-test/suite/backup_ptr/my.cnf
        A  mysql-test/suite/rpl/include/rpl_backup_basic.inc
        A  mysql-test/suite/rpl/include/rpl_backup_multi.inc
        A  mysql-test/suite/rpl/include/rpl_backup_multi_sync.inc
        A  mysql-test/suite/rpl/r/rpl_backup_block.result
        A  mysql-test/suite/rpl/r/rpl_backup_extra.result
        A  mysql-test/suite/rpl/r/rpl_backup_multi.result
        A  mysql-test/suite/rpl/r/rpl_backup_ptr.result
        A  mysql-test/suite/rpl/r/rpl_backup_shutdown.result
        A  mysql-test/suite/rpl/t/rpl_backup.cnf
        A  mysql-test/suite/rpl/t/rpl_backup_block.cnf
        A  mysql-test/suite/rpl/t/rpl_backup_block.test
        A  mysql-test/suite/rpl/t/rpl_backup_extra.cnf
        A  mysql-test/suite/rpl/t/rpl_backup_extra.test
        A  mysql-test/suite/rpl/t/rpl_backup_multi.cnf
        A  mysql-test/suite/rpl/t/rpl_backup_multi.test
        A  mysql-test/suite/rpl/t/rpl_backup_ptr.cnf
        A  mysql-test/suite/rpl/t/rpl_backup_ptr.test
        A  mysql-test/suite/rpl/t/rpl_backup_shutdown-slave.opt
        A  mysql-test/suite/rpl/t/rpl_backup_shutdown.cnf
        A  mysql-test/suite/rpl/t/rpl_backup_shutdown.test
        A  mysql-test/t/backup_disabled.test
        A  mysql-test/t/implicit_commit.cnf
        A  unittest/mysys/safe_cleanup_cat_path-t.c
        M  CMakeLists.txt
        M  Makefile.am
        M  client/backup_stream.c
        M  client/mysqlbackup.cc
        M  include/config-win.h
        M  include/my_dir.h
        M  include/my_sys.h
        M  mysql-test/collections/default.experimental
        M  mysql-test/include/have_rqg.inc
        M  mysql-test/suite/backup/r/backup.result
        M  mysql-test/suite/backup/r/backup_backupdir.result
        M  mysql-test/suite/backup/r/backup_charsets.result
        M  mysql-test/suite/backup/r/backup_dbname_lctn1.result
        M  mysql-test/suite/backup/r/backup_dbname_lctn2.result
        M  mysql-test/suite/backup/r/backup_default_debug.result
        M  mysql-test/suite/backup/r/backup_external.result
        M  mysql-test/suite/backup/r/backup_image_name_notwin.result
        M  mysql-test/suite/backup/r/backup_intr_errors.result
        M  mysql-test/suite/backup/r/backup_logs.result
        M  mysql-test/suite/backup/r/backup_logs_purge.result
        M  mysql-test/suite/backup/r/backup_securebackup.result
        M  mysql-test/suite/backup/r/backup_triggers_and_events.result
        M  mysql-test/suite/backup/t/backup.test
        M  mysql-test/suite/backup/t/backup_backupdir.test
        M  mysql-test/suite/backup/t/backup_charsets.test
        M  mysql-test/suite/backup/t/backup_dbname_lctn1.test
        M  mysql-test/suite/backup/t/backup_default_debug.test
        M  mysql-test/suite/backup/t/backup_external.test
        M  mysql-test/suite/backup/t/backup_image_name_notwin.test
        M  mysql-test/suite/backup/t/backup_logs.test
        M  mysql-test/suite/backup/t/backup_securebackup-master.opt
        M  mysql-test/suite/backup/t/backup_securebackup.test
        M  mysql-test/suite/backup/t/backup_triggers_and_events.test
        M  mysql-test/suite/backup_engines/combinations
        M  mysql-test/suite/backup_engines/include/backup_restore_interrupt.inc
        M  mysql-test/suite/backup_engines/r/backup_interruption.result
        M  mysql-test/suite/backup_engines/t/backup_interruption.test
        M  mysql-test/suite/backup_ptr/r/backup_ptr_commits.result
        M  mysql-test/suite/backup_ptr/t/backup_ptr.test
        M  mysql-test/suite/backup_ptr/t/backup_ptr_commits.test
        M  mysql-test/suite/backup_ptr/t/backup_ptr_objects.test
        M  mysql-test/suite/funcs_1/r/is_columns_mysql.result
        M  mysys/mf_format.c
        M  mysys/mf_pack.c
        M  mysys/my_init.c
        M  mysys/my_lib.c
        M  mysys/my_static.c
        M  scripts/mysql_system_tables.sql
        M  scripts/mysql_system_tables_fix.sql
        M  sql/CMakeLists.txt
        M  sql/backup/backup_aux.h
        M  sql/backup/be_default.cc
        M  sql/backup/data_backup.cc
        M  sql/backup/image_info.cc
        M  sql/backup/image_info.h
        M  sql/backup/kernel.cc
        M  sql/backup/logger.h
        M  sql/backup/stream.cc
        M  sql/backup/stream_v1.c
        M  sql/backup/stream_v1.h
        M  sql/backup/stream_v1_transport.c
        M  sql/lock.cc
        M  sql/log.cc
        M  sql/log.h
        M  sql/mysql_priv.h
        M  sql/mysqld.cc
        M  sql/set_var.cc
        M  sql/set_var.h
        M  sql/share/errmsg.txt
        M  sql/si_logs.cc
        M  sql/si_logs.h
        M  sql/si_objects.cc
        M  sql/si_objects.h
        M  sql/sql_parse.cc
        M  support-files/compiler_warnings.supp
        M  unittest/mysys/CMakeLists.txt
        M  unittest/mysys/Makefile.am
    2599.149.10 Luis Soares	2009-05-31 [merge]
                Merge: mysql-azalea --> 6.0-rpl
                Manually resolved conflicts:
                  Text conflict in .bzr-mysql/default.conf
                  Conflict: can't delete mysql-test/suite/falcon because it is not empty.  Not deleting.
                  Conflict because mysql-test/suite/falcon is not versioned, but has versioned children.  Versioned directory.
                  Conflict: can't delete mysql-test/suite/falcon/r because it is not empty.  Not deleting.
                  Conflict because mysql-test/suite/falcon/r is not versioned, but has versioned children.  Versioned directory.
                  Contents conflict in mysql-test/suite/falcon/r/falcon_tablespace_priv.result
                  Contents conflict in mysql-test/suite/funcs_1/r/falcon_trig_03e.result

        D  config/ac-macros/libevent.m4
        D  extra/libevent/
        D  extra/libevent/CMakeLists.txt
        D  extra/libevent/Makefile.am
        D  extra/libevent/README
        D  extra/libevent/WIN32-Code/
        D  extra/libevent/WIN32-Code/config.h
        D  extra/libevent/WIN32-Code/misc.c
        D  extra/libevent/WIN32-Code/misc.h
        D  extra/libevent/WIN32-Code/tree.h
        D  extra/libevent/WIN32-Code/win32.c
        D  extra/libevent/buffer.c
        D  extra/libevent/compat/
        D  extra/libevent/compat/sys/
        D  extra/libevent/compat/sys/_time.h
        D  extra/libevent/compat/sys/queue.h
        D  extra/libevent/compat/sys/tree.h
        D  extra/libevent/devpoll.c
        D  extra/libevent/epoll.c
        D  extra/libevent/epoll_sub.c
        D  extra/libevent/evbuffer.c
        D  extra/libevent/evdns.c
        D  extra/libevent/evdns.h
        D  extra/libevent/event-internal.h
        D  extra/libevent/event.c
        D  extra/libevent/event.h
        D  extra/libevent/event_tagging.c
        D  extra/libevent/evhttp.h
        D  extra/libevent/evport.c
        D  extra/libevent/evrpc-internal.h
        D  extra/libevent/evrpc.c
        D  extra/libevent/evrpc.h
        D  extra/libevent/evsignal.h
        D  extra/libevent/evutil.c
        D  extra/libevent/evutil.h
        D  extra/libevent/http-internal.h
        D  extra/libevent/http.c
        D  extra/libevent/kqueue.c
        D  extra/libevent/log.c
        D  extra/libevent/log.h
        D  extra/libevent/min_heap.h
        D  extra/libevent/poll.c
        D  extra/libevent/select.c
        D  extra/libevent/signal.c
        D  extra/libevent/strlcpy-internal.h
        D  extra/libevent/strlcpy.c
        D  mysql-test/collections/falcon_team.experimental
        D  mysql-test/collections/mysql-6.0-bugteam.push
        D  mysql-test/collections/mysql-6.0-falcon-.push
        D  mysql-test/collections/mysql-6.0-maria.push
        D  mysql-test/collections/mysql-6.0-rpl.push
        D  mysql-test/collections/mysql-6.0-runtime.push
        D  mysql-test/include/falcon_limit1.inc
        D  mysql-test/include/falcon_limit2.inc
        D  mysql-test/include/have_maria.inc
        D  mysql-test/include/initialize_falcon.inc
        D  mysql-test/include/maria_empty_logs.inc
        D  mysql-test/include/maria_make_snapshot.inc
        D  mysql-test/include/maria_make_snapshot_for_comparison.inc
        D  mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
        D  mysql-test/include/maria_verify_recovery.inc
        D  mysql-test/r/partition_falcon.result
        D  mysql-test/suite/backup/r/backup_maria.result
        D  mysql-test/suite/backup/r/backup_maria_other_instance.result
        D  mysql-test/suite/backup/t/backup_maria.test
        D  mysql-test/suite/backup/t/backup_maria_other_instance.test
        D  mysql-test/suite/backup_engines/include/not_falcon.inc
        D  mysql-test/suite/backup_extra/r/backup_consistency_falcon.result
        D  mysql-test/suite/backup_extra/t/backup_consistency_falcon.test
        D  mysql-test/suite/falcon/
        D  mysql-test/suite/falcon/r/
        D  mysql-test/suite/falcon/r/falcon_blob_space-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_22089.result
        D  mysql-test/suite/falcon/r/falcon_bug_22125.result
        D  mysql-test/suite/falcon/r/falcon_bug_22143.result
        D  mysql-test/suite/falcon/r/falcon_bug_22144.result
        D  mysql-test/suite/falcon/r/falcon_bug_22150-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_22150.result
        D  mysql-test/suite/falcon/r/falcon_bug_22151.result
        D  mysql-test/suite/falcon/r/falcon_bug_22154-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_22160.result
        D  mysql-test/suite/falcon/r/falcon_bug_22161.result
        D  mysql-test/suite/falcon/r/falcon_bug_22164.result
        D  mysql-test/suite/falcon/r/falcon_bug_22165.result
        D  mysql-test/suite/falcon/r/falcon_bug_22167.result
        D  mysql-test/suite/falcon/r/falcon_bug_22168.result
        D  mysql-test/suite/falcon/r/falcon_bug_22169-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_22170.result
        D  mysql-test/suite/falcon/r/falcon_bug_22171.result
        D  mysql-test/suite/falcon/r/falcon_bug_22172.result
        D  mysql-test/suite/falcon/r/falcon_bug_22173.result
        D  mysql-test/suite/falcon/r/falcon_bug_22173a.result
        D  mysql-test/suite/falcon/r/falcon_bug_22174.result
        D  mysql-test/suite/falcon/r/falcon_bug_22175.result
        D  mysql-test/suite/falcon/r/falcon_bug_22179.result
        D  mysql-test/suite/falcon/r/falcon_bug_22180.result
        D  mysql-test/suite/falcon/r/falcon_bug_22181.result
        D  mysql-test/suite/falcon/r/falcon_bug_22183.result
        D  mysql-test/suite/falcon/r/falcon_bug_22184.result
        D  mysql-test/suite/falcon/r/falcon_bug_22185.result
        D  mysql-test/suite/falcon/r/falcon_bug_22189.result
        D  mysql-test/suite/falcon/r/falcon_bug_22207-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_22207.result
        D  mysql-test/suite/falcon/r/falcon_bug_22211.result
        D  mysql-test/suite/falcon/r/falcon_bug_22212.result
        D  mysql-test/suite/falcon/r/falcon_bug_22303.result
        D  mysql-test/suite/falcon/r/falcon_bug_22516.result
        D  mysql-test/suite/falcon/r/falcon_bug_22564.result
        D  mysql-test/suite/falcon/r/falcon_bug_22841.result
        D  mysql-test/suite/falcon/r/falcon_bug_22842.result
        D  mysql-test/suite/falcon/r/falcon_bug_22845.result
        D  mysql-test/suite/falcon/r/falcon_bug_22847.result
        D  mysql-test/suite/falcon/r/falcon_bug_22852.result
        D  mysql-test/suite/falcon/r/falcon_bug_22939.result
        D  mysql-test/suite/falcon/r/falcon_bug_22972.result
        D  mysql-test/suite/falcon/r/falcon_bug_23189.result
        D  mysql-test/suite/falcon/r/falcon_bug_23517.result
        D  mysql-test/suite/falcon/r/falcon_bug_23663.result
        D  mysql-test/suite/falcon/r/falcon_bug_23682.result
        D  mysql-test/suite/falcon/r/falcon_bug_23689.result
        D  mysql-test/suite/falcon/r/falcon_bug_23691.result
        D  mysql-test/suite/falcon/r/falcon_bug_23692.result
        D  mysql-test/suite/falcon/r/falcon_bug_23816.result
        D  mysql-test/suite/falcon/r/falcon_bug_23818_A.result
        D  mysql-test/suite/falcon/r/falcon_bug_23818_B.result
        D  mysql-test/suite/falcon/r/falcon_bug_23818_C.result
        D  mysql-test/suite/falcon/r/falcon_bug_23818_I.result
        D  mysql-test/suite/falcon/r/falcon_bug_23818_II.result
        D  mysql-test/suite/falcon/r/falcon_bug_23945.result
        D  mysql-test/suite/falcon/r/falcon_bug_23962.result
        D  mysql-test/suite/falcon/r/falcon_bug_23965.result
        D  mysql-test/suite/falcon/r/falcon_bug_24008.result
        D  mysql-test/suite/falcon/r/falcon_bug_24017.result
        D  mysql-test/suite/falcon/r/falcon_bug_24024.result
        D  mysql-test/suite/falcon/r/falcon_bug_24079.result
        D  mysql-test/suite/falcon/r/falcon_bug_24511.result
        D  mysql-test/suite/falcon/r/falcon_bug_24858.result
        D  mysql-test/suite/falcon/r/falcon_bug_24921.result
        D  mysql-test/suite/falcon/r/falcon_bug_25160.result
        D  mysql-test/suite/falcon/r/falcon_bug_25393.result
        D  mysql-test/suite/falcon/r/falcon_bug_25537.result
        D  mysql-test/suite/falcon/r/falcon_bug_25555.result
        D  mysql-test/suite/falcon/r/falcon_bug_26057.result
        D  mysql-test/suite/falcon/r/falcon_bug_26420.result
        D  mysql-test/suite/falcon/r/falcon_bug_26433-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_26433.result
        D  mysql-test/suite/falcon/r/falcon_bug_26468.result
        D  mysql-test/suite/falcon/r/falcon_bug_26469.result
        D  mysql-test/suite/falcon/r/falcon_bug_26607.result
        D  mysql-test/suite/falcon/r/falcon_bug_26802.result
        D  mysql-test/suite/falcon/r/falcon_bug_26803.result
        D  mysql-test/suite/falcon/r/falcon_bug_26827.result
        D  mysql-test/suite/falcon/r/falcon_bug_26828.result
        D  mysql-test/suite/falcon/r/falcon_bug_26871.result
        D  mysql-test/suite/falcon/r/falcon_bug_27350.result
        D  mysql-test/suite/falcon/r/falcon_bug_27357.result
        D  mysql-test/suite/falcon/r/falcon_bug_27426.result
        D  mysql-test/suite/falcon/r/falcon_bug_27574.result
        D  mysql-test/suite/falcon/r/falcon_bug_27696.result
        D  mysql-test/suite/falcon/r/falcon_bug_27697.result
        D  mysql-test/suite/falcon/r/falcon_bug_27719.result
        D  mysql-test/suite/falcon/r/falcon_bug_27722.result
        D  mysql-test/suite/falcon/r/falcon_bug_27767.result
        D  mysql-test/suite/falcon/r/falcon_bug_27895.result
        D  mysql-test/suite/falcon/r/falcon_bug_27951.result
        D  mysql-test/suite/falcon/r/falcon_bug_27962.result
        D  mysql-test/suite/falcon/r/falcon_bug_27993.result
        D  mysql-test/suite/falcon/r/falcon_bug_27997.result
        D  mysql-test/suite/falcon/r/falcon_bug_28026.result
        D  mysql-test/suite/falcon/r/falcon_bug_28028.result
        D  mysql-test/suite/falcon/r/falcon_bug_28031.result
        D  mysql-test/suite/falcon/r/falcon_bug_28032.result
        D  mysql-test/suite/falcon/r/falcon_bug_28034.result
        D  mysql-test/suite/falcon/r/falcon_bug_28035.result
        D  mysql-test/suite/falcon/r/falcon_bug_28037.result
        D  mysql-test/suite/falcon/r/falcon_bug_28038.result
        D  mysql-test/suite/falcon/r/falcon_bug_28039.result
        D  mysql-test/suite/falcon/r/falcon_bug_28040.result
        D  mysql-test/suite/falcon/r/falcon_bug_28041.result
        D  mysql-test/suite/falcon/r/falcon_bug_28042.result
        D  mysql-test/suite/falcon/r/falcon_bug_28044.result
        D  mysql-test/suite/falcon/r/falcon_bug_28045.result
        D  mysql-test/suite/falcon/r/falcon_bug_28046.result
        D  mysql-test/suite/falcon/r/falcon_bug_28048.result
        D  mysql-test/suite/falcon/r/falcon_bug_28049.result
        D  mysql-test/suite/falcon/r/falcon_bug_28050.result
        D  mysql-test/suite/falcon/r/falcon_bug_28051.result
        D  mysql-test/suite/falcon/r/falcon_bug_28052.result
        D  mysql-test/suite/falcon/r/falcon_bug_28053.result
        D  mysql-test/suite/falcon/r/falcon_bug_28055.result
        D  mysql-test/suite/falcon/r/falcon_bug_28056.result
        D  mysql-test/suite/falcon/r/falcon_bug_28057.result
        D  mysql-test/suite/falcon/r/falcon_bug_28058.result
        D  mysql-test/suite/falcon/r/falcon_bug_28059.result
        D  mysql-test/suite/falcon/r/falcon_bug_28060.result
        D  mysql-test/suite/falcon/r/falcon_bug_28076.result
        D  mysql-test/suite/falcon/r/falcon_bug_28095.result
        D  mysql-test/suite/falcon/r/falcon_bug_28158.result
        D  mysql-test/suite/falcon/r/falcon_bug_28165.result
        D  mysql-test/suite/falcon/r/falcon_bug_28500.result
        D  mysql-test/suite/falcon/r/falcon_bug_28725.result
        D  mysql-test/suite/falcon/r/falcon_bug_29151.result
        D  mysql-test/suite/falcon/r/falcon_bug_29151_A.result
        D  mysql-test/suite/falcon/r/falcon_bug_29151_B.result
        D  mysql-test/suite/falcon/r/falcon_bug_29151_C.result
        D  mysql-test/suite/falcon/r/falcon_bug_29201.result
        D  mysql-test/suite/falcon/r/falcon_bug_29240.result
        D  mysql-test/suite/falcon/r/falcon_bug_29246.result
        D  mysql-test/suite/falcon/r/falcon_bug_29319.result
        D  mysql-test/suite/falcon/r/falcon_bug_29332.result
        D  mysql-test/suite/falcon/r/falcon_bug_29452.result
        D  mysql-test/suite/falcon/r/falcon_bug_29511.result
        D  mysql-test/suite/falcon/r/falcon_bug_30031.result
        D  mysql-test/suite/falcon/r/falcon_bug_30124-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_30124.result
        D  mysql-test/suite/falcon/r/falcon_bug_30210.result
        D  mysql-test/suite/falcon/r/falcon_bug_30282.result
        D  mysql-test/suite/falcon/r/falcon_bug_30480_A.result
        D  mysql-test/suite/falcon/r/falcon_bug_30480_B.result
        D  mysql-test/suite/falcon/r/falcon_bug_30826.result
        D  mysql-test/suite/falcon/r/falcon_bug_30878.result
        D  mysql-test/suite/falcon/r/falcon_bug_31110.result
        D  mysql-test/suite/falcon/r/falcon_bug_31114.result
        D  mysql-test/suite/falcon/r/falcon_bug_31295.result
        D  mysql-test/suite/falcon/r/falcon_bug_31296.result
        D  mysql-test/suite/falcon/r/falcon_bug_31311.result
        D  mysql-test/suite/falcon/r/falcon_bug_31490.result
        D  mysql-test/suite/falcon/r/falcon_bug_32194.result
        D  mysql-test/suite/falcon/r/falcon_bug_32398.result
        D  mysql-test/suite/falcon/r/falcon_bug_32833.result
        D  mysql-test/suite/falcon/r/falcon_bug_33041.result
        D  mysql-test/suite/falcon/r/falcon_bug_33081.result
        D  mysql-test/suite/falcon/r/falcon_bug_33148.result
        D  mysql-test/suite/falcon/r/falcon_bug_33184.result
        D  mysql-test/suite/falcon/r/falcon_bug_33184_II.result
        D  mysql-test/suite/falcon/r/falcon_bug_33211.result
        D  mysql-test/suite/falcon/r/falcon_bug_33212.result
        D  mysql-test/suite/falcon/r/falcon_bug_33213.result
        D  mysql-test/suite/falcon/r/falcon_bug_33216.result
        D  mysql-test/suite/falcon/r/falcon_bug_33397.result
        D  mysql-test/suite/falcon/r/falcon_bug_33404.result
        D  mysql-test/suite/falcon/r/falcon_bug_33662.result
        D  mysql-test/suite/falcon/r/falcon_bug_33719.result
        D  mysql-test/suite/falcon/r/falcon_bug_33720.result
        D  mysql-test/suite/falcon/r/falcon_bug_33723.result
        D  mysql-test/suite/falcon/r/falcon_bug_34048.result
        D  mysql-test/suite/falcon/r/falcon_bug_34164.result
        D  mysql-test/suite/falcon/r/falcon_bug_34182.result
        D  mysql-test/suite/falcon/r/falcon_bug_34351_A-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_34351_A.result
        D  mysql-test/suite/falcon/r/falcon_bug_34351_C-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_34351_D.result
        D  mysql-test/suite/falcon/r/falcon_bug_34478.result
        D  mysql-test/suite/falcon/r/falcon_bug_34617.result
        D  mysql-test/suite/falcon/r/falcon_bug_34890.result
        D  mysql-test/suite/falcon/r/falcon_bug_34892.result
        D  mysql-test/suite/falcon/r/falcon_bug_35257.result
        D  mysql-test/suite/falcon/r/falcon_bug_35939.result
        D  mysql-test/suite/falcon/r/falcon_bug_36186.result
        D  mysql-test/suite/falcon/r/falcon_bug_36294-big.result
        D  mysql-test/suite/falcon/r/falcon_bug_37080.result
        D  mysql-test/suite/falcon/r/falcon_bug_37343.result
        D  mysql-test/suite/falcon/r/falcon_bug_37344_A.result
        D  mysql-test/suite/falcon/r/falcon_bug_37668.result
        D  mysql-test/suite/falcon/r/falcon_bug_38039.result
        D  mysql-test/suite/falcon/r/falcon_bug_38186.result
        D  mysql-test/suite/falcon/r/falcon_bug_38304.result
        D  mysql-test/suite/falcon/r/falcon_bug_39342.result
        D  mysql-test/suite/falcon/r/falcon_bug_39692.result
        D  mysql-test/suite/falcon/r/falcon_bug_39702.result
        D  mysql-test/suite/falcon/r/falcon_bug_39708.result
        D  mysql-test/suite/falcon/r/falcon_bug_40130.result
        D  mysql-test/suite/falcon/r/falcon_bug_40158.result
        D  mysql-test/suite/falcon/r/falcon_bug_40607.result
        D  mysql-test/suite/falcon/r/falcon_bug_40614.result
        D  mysql-test/suite/falcon/r/falcon_bug_40801.result
        D  mysql-test/suite/falcon/r/falcon_bug_40950.result
        D  mysql-test/suite/falcon/r/falcon_bug_40994.result
        D  mysql-test/suite/falcon/r/falcon_bug_41548.result
        D  mysql-test/suite/falcon/r/falcon_bug_41582.result
        D  mysql-test/suite/falcon/r/falcon_bug_41688.result
        D  mysql-test/suite/falcon/r/falcon_bug_41890.result
        D  mysql-test/suite/falcon/r/falcon_bug_42069.result
        D  mysql-test/suite/falcon/r/falcon_bug_42196.result
        D  mysql-test/suite/falcon/r/falcon_bug_42208.result
        D  mysql-test/suite/falcon/r/falcon_bug_42405.result
        D  mysql-test/suite/falcon/r/falcon_bug_42478.result
        D  mysql-test/suite/falcon/r/falcon_bug_43452.result
        D  mysql-test/suite/falcon/r/falcon_bugs.result
        D  mysql-test/suite/falcon/r/falcon_bugs2.result
        D  mysql-test/suite/falcon/r/falcon_deadlock_collection.result
        D  mysql-test/suite/falcon/r/falcon_index_datatypes.result
        D  mysql-test/suite/falcon/r/falcon_index_v2.result
        D  mysql-test/suite/falcon/r/falcon_information_schema.result
        D  mysql-test/suite/falcon/r/falcon_limits.result
        D  mysql-test/suite/falcon/r/falcon_online_index.result
        D  mysql-test/suite/falcon/r/falcon_options.result
        D  mysql-test/suite/falcon/r/falcon_options2.result
        D  mysql-test/suite/falcon/r/falcon_page_size_16.result
        D  mysql-test/suite/falcon/r/falcon_page_size_2.result
        D  mysql-test/suite/falcon/r/falcon_page_size_32.result
        D  mysql-test/suite/falcon/r/falcon_page_size_4.result
        D  mysql-test/suite/falcon/r/falcon_page_size_8.result
        D  mysql-test/suite/falcon/r/falcon_ps_repeatable_read.result
        D  mysql-test/suite/falcon/r/falcon_read-committed.result
        D  mysql-test/suite/falcon/r/falcon_record_cache_memory_leak-big.result
        D  mysql-test/suite/falcon/r/falcon_record_cache_memory_leak.result
        D  mysql-test/suite/falcon/r/falcon_record_cache_memory_leak2-big.result
        D  mysql-test/suite/falcon/r/falcon_record_cache_memory_leak2.result
        D  mysql-test/suite/falcon/r/falcon_savepoint.result
        D  mysql-test/suite/falcon/r/falcon_select.result
        D  mysql-test/suite/falcon/r/falcon_select_explain.result
        D  mysql-test/suite/falcon/r/falcon_select_for_update.result
        D  mysql-test/suite/falcon/r/falcon_tablespace_priv.result
        D  mysql-test/suite/falcon/r/falcon_temporary_alter.result
        D  mysql-test/suite/falcon/r/falcon_unicode-big.result
        D  mysql-test/suite/falcon/r/falcon_year_4digit.result
        D  mysql-test/suite/falcon/r/index_merge_falcon.result
        D  mysql-test/suite/falcon/r/ps_8falcon.result
        D  mysql-test/suite/falcon/r/rowid_order_falcon.result
        D  mysql-test/suite/falcon/r/rpl_bug_33688.result
        D  mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
        D  mysql-test/suite/falcon/t/
        D  mysql-test/suite/falcon/t/disabled.def
        D  mysql-test/suite/falcon/t/falcon_blob_space-big.cnf
        D  mysql-test/suite/falcon/t/falcon_blob_space-big.test
        D  mysql-test/suite/falcon/t/falcon_bug.template
        D  mysql-test/suite/falcon/t/falcon_bug_22089.test
        D  mysql-test/suite/falcon/t/falcon_bug_22125.test
        D  mysql-test/suite/falcon/t/falcon_bug_22143.test
        D  mysql-test/suite/falcon/t/falcon_bug_22144.test
        D  mysql-test/suite/falcon/t/falcon_bug_22150-big.test
        D  mysql-test/suite/falcon/t/falcon_bug_22150.test
        D  mysql-test/suite/falcon/t/falcon_bug_22151.test
        D  mysql-test/suite/falcon/t/falcon_bug_22154-big.test
        D  mysql-test/suite/falcon/t/falcon_bug_22160.test
        D  mysql-test/suite/falcon/t/falcon_bug_22161.test
        D  mysql-test/suite/falcon/t/falcon_bug_22164.test
        D  mysql-test/suite/falcon/t/falcon_bug_22165.test
        D  mysql-test/suite/falcon/t/falcon_bug_22167.test
        D  mysql-test/suite/falcon/t/falcon_bug_22168.test
        D  mysql-test/suite/falcon/t/falcon_bug_22169-big.test
        D  mysql-test/suite/falcon/t/falcon_bug_22170.test
        D  mysql-test/suite/falcon/t/falcon_bug_22171.test
        D  mysql-test/suite/falcon/t/falcon_bug_22172.test
        D  mysql-test/suite/falcon/t/falcon_bug_22173.test
        D  mysql-test/suite/falcon/t/falcon_bug_22173a.test
        D  mysql-test/suite/falcon/t/falcon_bug_22174.test
        D  mysql-test/suite/falcon/t/falcon_bug_22175.test
        D  mysql-test/suite/falcon/t/falcon_bug_22179.test
        D  mysql-test/suite/falcon/t/falcon_bug_22180.test
        D  mysql-test/suite/falcon/t/falcon_bug_22181.test
        D  mysql-test/suite/falcon/t/falcon_bug_22183.test
        D  mysql-test/suite/falcon/t/falcon_bug_22184-master.opt
        D  mysql-test/suite/falcon/t/falcon_bug_22184.test
        D  mysql-test/suite/falcon/t/falcon_bug_22185.test
        D  mysql-test/suite/falcon/t/falcon_bug_22189.test
        D  mysql-test/suite/falcon/t/falcon_bug_22207-big.test
        D  mysql-test/suite/falcon/t/falcon_bug_22207.test
        D  mysql-test/suite/falcon/t/falcon_bug_22211.test
        D  mysql-test/suite/falcon/t/falcon_bug_22212.test
        D  mysql-test/suite/falcon/t/falcon_bug_22303.test
        D  mysql-test/suite/falcon/t/falcon_bug_22516.test
        D  mysql-test/suite/falcon/t/falcon_bug_22564.test
        D  mysql-test/suite/falcon/t/falcon_bug_22841.test
        D  mysql-test/suite/falcon/t/falcon_bug_22842.test
        D  mysql-test/suite/falcon/t/falcon_bug_22845.test
        D  mysql-test/suite/falcon/t/falcon_bug_22847.test
        D  mysql-test/suite/falcon/t/falcon_bug_22852.test
        D  mysql-test/suite/falcon/t/falcon_bug_22939.test
        D  mysql-test/suite/falcon/t/falcon_bug_22972.test
        D  mysql-test/suite/falcon/t/falcon_bug_23189.test
        D  mysql-test/suite/falcon/t/falcon_bug_23517.test
        D  mysql-test/suite/falcon/t/falcon_bug_23663.test
        D  mysql-test/suite/falcon/t/falcon_bug_23682.test
        D  mysql-test/suite/falcon/t/falcon_bug_23689.test
        D  mysql-test/suite/falcon/t/falcon_bug_23691.test
        D  mysql-test/suite/falcon/t/falcon_bug_23692.test
        D  mysql-test/suite/falcon/t/falcon_bug_23816.test
        D  mysql-test/suite/falcon/t/falcon_bug_23818_A.test
        D  mysql-test/suite/falcon/t/falcon_bug_23818_B.test
        D  mysql-test/suite/falcon/t/falcon_bug_23818_C.test
        D  mysql-test/suite/falcon/t/falcon_bug_23818_I.test
        D  mysql-test/suite/falcon/t/falcon_bug_23818_II.test
        D  mysql-test/suite/falcon/t/falcon_bug_23945.test
        D  mysql-test/suite/falcon/t/falcon_bug_23962.test
        D  mysql-test/suite/falcon/t/falcon_bug_23965.test
        D  mysql-test/suite/falcon/t/falcon_bug_24008.test
        D  mysql-test/suite/falcon/t/falcon_bug_24017.test
        D  mysql-test/suite/falcon/t/falcon_bug_24024.test
        D  mysql-test/suite/falcon/t/falcon_bug_24079.test
        D  mysql-test/suite/falcon/t/falcon_bug_24511.test
        D  mysql-test/suite/falcon/t/falcon_bug_24858.test
        D  mysql-test/suite/falcon/t/falcon_bug_24921.test
        D  mysql-test/suite/falcon/t/falcon_bug_25160.test
        D  mysql-test/suite/falcon/t/falcon_bug_25393.test
        D  mysql-test/suite/falcon/t/falcon_bug_25537.test
        D  mysql-test/suite/falcon/t/falcon_bug_25555.test
        D  mysql-test/suite/falcon/t/falcon_bug_26057.test
        D  mysql-test/suite/falcon/t/falcon_bug_26420.test
        D  mysql-test/suite/falcon/t/falcon_bug_26433-big.test
        D  mysql-test/suite/falcon/t/falcon_bug_26433.test
        D  mysql-test/suite/falcon/t/falcon_bug_26468.test
        D  mysql-test/suite/falcon/t/falcon_bug_26469.test
        D  mysql-test/suite/falcon/t/falcon_bug_26607.test
        D  mysql-test/suite/falcon/t/falcon_bug_26802.test
        D  mysql-test/suite/falcon/t/falcon_bug_26803.test
        D  mysql-test/suite/falcon/t/falcon_bug_26827.test
        D  mysql-test/suite/falcon/t/falcon_bug_26828.test
        D  mysql-test/suite/falcon/t/falcon_bug_26871.test
        D  mysql-test/suite/falcon/t/falcon_bug_27350.test
        D  mysql-test/suite/falcon/t/falcon_bug_27357.test
        D  mysql-test/suite/falcon/t/falcon_bug_27426.test
        D  mysql-test/suite/falcon/t/falcon_bug_27574.test
        D  mysql-test/suite/falcon/t/falcon_bug_27696.test
        D  mysql-test/suite/falcon/t/falcon_bug_27697.test
        D  mysql-test/suite/falcon/t/falcon_bug_27719.test
        D  mysql-test/suite/falcon/t/falcon_bug_27722.test
        D  mysql-test/suite/falcon/t/falcon_bug_27767.test
        D  mysql-test/suite/falcon/t/falcon_bug_27895.test
        D  mysql-test/suite/falcon/t/falcon_bug_27951.test
        D  mysql-test/suite/falcon/t/falcon_bug_27962.test
        D  mysql-test/suite/falcon/t/falcon_bug_27993.test
        D  mysql-test/suite/falcon/t/falcon_bug_27997.test
        D  mysql-test/suite/falcon/t/falcon_bug_28026.test
        D  mysql-test/suite/falcon/t/falcon_bug_28028.test
        D  mysql-test/suite/falcon/t/falcon_bug_28031.test
        D  mysql-test/suite/falcon/t/falcon_bug_28032.test
        D  mysql-test/suite/falcon/t/falcon_bug_28034.test
        D  mysql-test/suite/falcon/t/falcon_bug_28035.test
        D  mysql-test/suite/falcon/t/falcon_bug_28037.test
        D  mysql-test/suite/falcon/t/falcon_bug_28038.test
        D  mysql-test/suite/falcon/t/falcon_bug_28039.test
        D  mysql-test/suite/falcon/t/falcon_bug_28040.test
        D  mysql-test/suite/falcon/t/falcon_bug_28041.test
        D  mysql-test/suite/falcon/t/falcon_bug_28042.test
        D  mysql-test/suite/falcon/t/falcon_bug_28044.test
        D  mysql-test/suite/falcon/t/falcon_bug_28045.test
        D  mysql-test/suite/falcon/t/falcon_bug_28046.test
        D  mysql-test/suite/falcon/t/falcon_bug_28048.test
        D  mysql-test/suite/falcon/t/falcon_bug_28049.test
        D  mysql-test/suite/falcon/t/falcon_bug_28050.test
        D  mysql-test/suite/falcon/t/falcon_bug_28051.test
        D  mysql-test/suite/falcon/t/falcon_bug_28052.test
        D  mysql-test/suite/falcon/t/falcon_bug_28053.test
        D  mysql-test/suite/falcon/t/falcon_bug_28055.test
        D  mysql-test/suite/falcon/t/falcon_bug_28056.test
        D  mysql-test/suite/falcon/t/falcon_bug_28057.test
        D  mysql-test/suite/falcon/t/falcon_bug_28058.test
        D  mysql-test/suite/falcon/t/falcon_bug_28059.test
        D  mysql-test/suite/falcon/t/falcon_bug_28060.test
        D  mysql-test/suite/falcon/t/falcon_bug_28076.test
        D  mysql-test/suite/falcon/t/falcon_bug_28095.test
        D  mysql-test/suite/falcon/t/falcon_bug_28158.test
        D  mysql-test/suite/falcon/t/falcon_bug_28165.test
        D  mysql-test/suite/falcon/t/falcon_bug_28500.test
        D  mysql-test/suite/falcon/t/falcon_bug_28725.test
        D  mysql-test/suite/falcon/t/falcon_bug_29151.test
        D  mysql-test/suite/falcon/t/falcon_bug_29151_A.test
        D  mysql-test/suite/falcon/t/falcon_bug_29151_B.test
        D  mysql-test/suite/falcon/t/falcon_bug_29151_C.test
        D  mysql-test/suite/falcon/t/falcon_bug_29201.test
        D  mysql-test/suite/falcon/t/falcon_bug_29240.test
        D  mysql-test/suite/falcon/t/falcon_bug_29246.test
        D  mysql-test/suite/falcon/t/falcon_bug_29319.test
        D  mysql-test/suite/falcon/t/falcon_bug_29332.test
        D  mysql-test/suite/falcon/t/falcon_bug_29452.test
        D  mysql-test/suite/falcon/t/falcon_bug_29511.test
        D  mysql-test/suite/falcon/t/falcon_bug_30031.test
        D  mysql-test/suite/falcon/t/falcon_bug_30124-big.test
        D  mysql-test/suite/falcon/t/falcon_bug_30124.test
        D  mysql-test/suite/falcon/t/falcon_bug_30210.test
        D  mysql-test/suite/falcon/t/falcon_bug_30282.test
        D  mysql-test/suite/falcon/t/falcon_bug_30480_A.test
        D  mysql-test/suite/falcon/t/falcon_bug_30480_B.test
        D  mysql-test/suite/falcon/t/falcon_bug_30826.test
        D  mysql-test/suite/falcon/t/falcon_bug_30878.test
        D  mysql-test/suite/falcon/t/falcon_bug_31110.test
        D  mysql-test/suite/falcon/t/falcon_bug_31114.test
        D  mysql-test/suite/falcon/t/falcon_bug_31295.test
        D  mysql-test/suite/falcon/t/falcon_bug_31296.test
        D  mysql-test/suite/falcon/t/falcon_bug_31311.test
        D  mysql-test/suite/falcon/t/falcon_bug_31490.test
        D  mysql-test/suite/falcon/t/falcon_bug_32194.test
        D  mysql-test/suite/falcon/t/falcon_bug_32398.test
        D  mysql-test/suite/falcon/t/falcon_bug_32833.test
        D  mysql-test/suite/falcon/t/falcon_bug_33041.test
        D  mysql-test/suite/falcon/t/falcon_bug_33081.test
        D  mysql-test/suite/falcon/t/falcon_bug_33148.test
        D  mysql-test/suite/falcon/t/falcon_bug_33184.test
        D  mysql-test/suite/falcon/t/falcon_bug_33184_II.test
        D  mysql-test/suite/falcon/t/falcon_bug_33211.test
        D  mysql-test/suite/falcon/t/falcon_bug_33212.test
        D  mysql-test/suite/falcon/t/falcon_bug_33213.test
        D  mysql-test/suite/falcon/t/falcon_bug_33216.test
        D  mysql-test/suite/falcon/t/falcon_bug_33397.test
        D  mysql-test/suite/falcon/t/falcon_bug_33404.test
        D  mysql-test/suite/falcon/t/falcon_bug_33662.test
        D  mysql-test/suite/falcon/t/falcon_bug_33719.test
        D  mysql-test/suite/falcon/t/falcon_bug_33720.test
        D  mysql-test/suite/falcon/t/falcon_bug_33723.test
        D  mysql-test/suite/falcon/t/falcon_bug_34048.test
        D  mysql-test/suite/falcon/t/falcon_bug_34164.test
        D  mysql-test/suite/falcon/t/falcon_bug_34182.test
        D  mysql-test/suite/falcon/t/falcon_bug_34351_A-big.test
        D  mysql-test/suite/falcon/t/falcon_bug_34351_A.test
        D  mysql-test/suite/falcon/t/falcon_bug_34351_C-big.test
        D  mysql-test/suite/falcon/t/falcon_bug_34351_D.test
        D  mysql-test/suite/falcon/t/falcon_bug_34478.test
        D  mysql-test/suite/falcon/t/falcon_bug_34617.test
        D  mysql-test/suite/falcon/t/falcon_bug_34890.test
        D  mysql-test/suite/falcon/t/falcon_bug_34892.test
        D  mysql-test/suite/falcon/t/falcon_bug_35257.test
        D  mysql-test/suite/falcon/t/falcon_bug_35939.test
        D  mysql-test/suite/falcon/t/falcon_bug_36186.test
        D  mysql-test/suite/falcon/t/falcon_bug_36294-big.test
        D  mysql-test/suite/falcon/t/falcon_bug_37080.test
        D  mysql-test/suite/falcon/t/falcon_bug_37343.test
        D  mysql-test/suite/falcon/t/falcon_bug_37344_A.test
        D  mysql-test/suite/falcon/t/falcon_bug_37668.test
        D  mysql-test/suite/falcon/t/falcon_bug_38039.test
        D  mysql-test/suite/falcon/t/falcon_bug_38186.test
        D  mysql-test/suite/falcon/t/falcon_bug_38304.test
        D  mysql-test/suite/falcon/t/falcon_bug_39342.test
        D  mysql-test/suite/falcon/t/falcon_bug_39692.test
        D  mysql-test/suite/falcon/t/falcon_bug_39702.test
        D  mysql-test/suite/falcon/t/falcon_bug_39708-master.opt
        D  mysql-test/suite/falcon/t/falcon_bug_39708.test
        D  mysql-test/suite/falcon/t/falcon_bug_40130.test
        D  mysql-test/suite/falcon/t/falcon_bug_40158.test
        D  mysql-test/suite/falcon/t/falcon_bug_40607.test
        D  mysql-test/suite/falcon/t/falcon_bug_40614.test
        D  mysql-test/suite/falcon/t/falcon_bug_40801.test
        D  mysql-test/suite/falcon/t/falcon_bug_40950.test
        D  mysql-test/suite/falcon/t/falcon_bug_40994.test
        D  mysql-test/suite/falcon/t/falcon_bug_41548.test
        D  mysql-test/suite/falcon/t/falcon_bug_41582.test
        D  mysql-test/suite/falcon/t/falcon_bug_41688.test
        D  mysql-test/suite/falcon/t/falcon_bug_41890.test
        D  mysql-test/suite/falcon/t/falcon_bug_42069.test
        D  mysql-test/suite/falcon/t/falcon_bug_42196.test
        D  mysql-test/suite/falcon/t/falcon_bug_42208.test
        D  mysql-test/suite/falcon/t/falcon_bug_42405.test
        D  mysql-test/suite/falcon/t/falcon_bug_42478.test
        D  mysql-test/suite/falcon/t/falcon_bug_43452.test
        D  mysql-test/suite/falcon/t/falcon_bugs.test
        D  mysql-test/suite/falcon/t/falcon_bugs2.test
        D  mysql-test/suite/falcon/t/falcon_deadlock_collection.test
        D  mysql-test/suite/falcon/t/falcon_index_datatypes.test
        D  mysql-test/suite/falcon/t/falcon_index_v2.test
        D  mysql-test/suite/falcon/t/falcon_information_schema.test
        D  mysql-test/suite/falcon/t/falcon_limits.test
        D  mysql-test/suite/falcon/t/falcon_online_index.test
        D  mysql-test/suite/falcon/t/falcon_options.test
        D  mysql-test/suite/falcon/t/falcon_options2.test
        D  mysql-test/suite/falcon/t/falcon_page_size_16-master.opt
        D  mysql-test/suite/falcon/t/falcon_page_size_16.test
        D  mysql-test/suite/falcon/t/falcon_page_size_2-master.opt
        D  mysql-test/suite/falcon/t/falcon_page_size_2.test
        D  mysql-test/suite/falcon/t/falcon_page_size_32-master.opt
        D  mysql-test/suite/falcon/t/falcon_page_size_32.test
        D  mysql-test/suite/falcon/t/falcon_page_size_4-master.opt
        D  mysql-test/suite/falcon/t/falcon_page_size_4.test
        D  mysql-test/suite/falcon/t/falcon_page_size_8-master.opt
        D  mysql-test/suite/falcon/t/falcon_page_size_8.test
        D  mysql-test/suite/falcon/t/falcon_ps_repeatable_read.test
        D  mysql-test/suite/falcon/t/falcon_read-committed.test
        D  mysql-test/suite/falcon/t/falcon_record_cache_memory_leak-big.test
        D  mysql-test/suite/falcon/t/falcon_record_cache_memory_leak.test
        D  mysql-test/suite/falcon/t/falcon_record_cache_memory_leak2-big.test
        D  mysql-test/suite/falcon/t/falcon_record_cache_memory_leak2.test
        D  mysql-test/suite/falcon/t/falcon_savepoint.test
        D  mysql-test/suite/falcon/t/falcon_select.test
        D  mysql-test/suite/falcon/t/falcon_select_explain.test
        D  mysql-test/suite/falcon/t/falcon_select_for_update.test
        D  mysql-test/suite/falcon/t/falcon_tablespace_priv.test
        D  mysql-test/suite/falcon/t/falcon_temporary_alter.test
        D  mysql-test/suite/falcon/t/falcon_unicode-big.test
        D  mysql-test/suite/falcon/t/falcon_year_4digit.test
        D  mysql-test/suite/falcon/t/index_merge_falcon.test
        D  mysql-test/suite/falcon/t/ps_8falcon.test
        D  mysql-test/suite/falcon/t/rowid_order_falcon.test
        D  mysql-test/suite/falcon/t/rpl_bug_33688-slave.opt
        D  mysql-test/suite/falcon/t/rpl_bug_33688.test
        D  mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
        D  mysql-test/suite/falcon_team/
        D  mysql-test/suite/falcon_team/r/
        D  mysql-test/suite/falcon_team/r/falcon_bug_34174.result
        D  mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result
        D  mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result
        D  mysql-test/suite/falcon_team/r/falcon_deadlock.result
        D  mysql-test/suite/falcon_team/t/
        D  mysql-test/suite/falcon_team/t/disabled.def
        D  mysql-test/suite/falcon_team/t/falcon_bug_34174.test
        D  mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test
        D  mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test
        D  mysql-test/suite/falcon_team/t/falcon_deadlock.test
        D  mysql-test/suite/falcon_team/t/test2bug.def
        D  mysql-test/suite/funcs_1/include/falcon_tb1.inc
        D  mysql-test/suite/funcs_1/include/falcon_tb2.inc
        D  mysql-test/suite/funcs_1/include/falcon_tb3.inc
        D  mysql-test/suite/funcs_1/include/falcon_tb4.inc
        D  mysql-test/suite/funcs_1/r/falcon_bitdata.result
        D  mysql-test/suite/funcs_1/r/falcon_cursors.result
        D  mysql-test/suite/funcs_1/r/falcon_func_view.result
        D  mysql-test/suite/funcs_1/r/falcon_storedproc_02.result
        D  mysql-test/suite/funcs_1/r/falcon_storedproc_03.result
        D  mysql-test/suite/funcs_1/r/falcon_storedproc_06.result
        D  mysql-test/suite/funcs_1/r/falcon_storedproc_07.result
        D  mysql-test/suite/funcs_1/r/falcon_storedproc_08.result
        D  mysql-test/suite/funcs_1/r/falcon_storedproc_10.result
        D  mysql-test/suite/funcs_1/r/falcon_trig_0102.result
        D  mysql-test/suite/funcs_1/r/falcon_trig_03.result
        D  mysql-test/suite/funcs_1/r/falcon_trig_03e.result
        D  mysql-test/suite/funcs_1/r/falcon_trig_0407.result
        D  mysql-test/suite/funcs_1/r/falcon_trig_08.result
        D  mysql-test/suite/funcs_1/r/falcon_trig_09.result
        D  mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result
        D  mysql-test/suite/funcs_1/r/falcon_trig_frkey.result
        D  mysql-test/suite/funcs_1/r/falcon_views.result
        D  mysql-test/suite/funcs_1/r/is_cml_falcon.result
        D  mysql-test/suite/funcs_1/r/is_columns_falcon.result
        D  mysql-test/suite/funcs_1/r/is_columns_is_falcon.result
        D  mysql-test/suite/funcs_1/r/is_engines_falcon.result
        D  mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
        D  mysql-test/suite/funcs_1/t/falcon_bitdata.test
        D  mysql-test/suite/funcs_1/t/falcon_cursors.test
        D  mysql-test/suite/funcs_1/t/falcon_func_view.test
        D  mysql-test/suite/funcs_1/t/falcon_storedproc_02.test
        D  mysql-test/suite/funcs_1/t/falcon_storedproc_03.test
        D  mysql-test/suite/funcs_1/t/falcon_storedproc_06.test
        D  mysql-test/suite/funcs_1/t/falcon_storedproc_07.test
        D  mysql-test/suite/funcs_1/t/falcon_storedproc_08.test
        D  mysql-test/suite/funcs_1/t/falcon_storedproc_10.test
        D  mysql-test/suite/funcs_1/t/falcon_trig_0102.test
        D  mysql-test/suite/funcs_1/t/falcon_trig_03.test
        D  mysql-test/suite/funcs_1/t/falcon_trig_03e.test
        D  mysql-test/suite/funcs_1/t/falcon_trig_0407.test
        D  mysql-test/suite/funcs_1/t/falcon_trig_08.test
        D  mysql-test/suite/funcs_1/t/falcon_trig_09.test
        D  mysql-test/suite/funcs_1/t/falcon_trig_1011ext.test
        D  mysql-test/suite/funcs_1/t/falcon_trig_frkey.test
        D  mysql-test/suite/funcs_1/t/falcon_views.test
        D  mysql-test/suite/funcs_1/t/is_cml_falcon.test
        D  mysql-test/suite/funcs_1/t/is_columns_falcon.test
        D  mysql-test/suite/funcs_1/t/is_columns_is_falcon.test
        D  mysql-test/suite/funcs_1/t/is_engines_falcon.test
        D  mysql-test/suite/funcs_1/t/is_tables_is_falcon.test
        D  mysql-test/suite/maria/
        D  mysql-test/suite/maria/r/
        D  mysql-test/suite/maria/r/maria-autozerofill.result
        D  mysql-test/suite/maria/r/maria-big.result
        D  mysql-test/suite/maria/r/maria-big2.result
        D  mysql-test/suite/maria/r/maria-connect.result
        D  mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
        D  mysql-test/suite/maria/r/maria-gis-rtree-trans.result
        D  mysql-test/suite/maria/r/maria-gis-rtree.result
        D  mysql-test/suite/maria/r/maria-lock.result
        D  mysql-test/suite/maria/r/maria-mvcc.result
        D  mysql-test/suite/maria/r/maria-no-logging.result
        D  mysql-test/suite/maria/r/maria-page-checksum.result
        D  mysql-test/suite/maria/r/maria-preload.result
        D  mysql-test/suite/maria/r/maria-purge.result
        D  mysql-test/suite/maria/r/maria-recover.result
        D  mysql-test/suite/maria/r/maria-recovery-big.result
        D  mysql-test/suite/maria/r/maria-recovery-bitmap.result
        D  mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
        D  mysql-test/suite/maria/r/maria-recovery.result
        D  mysql-test/suite/maria/r/maria-recovery2.result
        D  mysql-test/suite/maria/r/maria-recovery3.result
        D  mysql-test/suite/maria/r/maria.result
        D  mysql-test/suite/maria/r/maria2.result
        D  mysql-test/suite/maria/r/maria3.result
        D  mysql-test/suite/maria/r/maria4.result
        D  mysql-test/suite/maria/r/maria_mrr.result
        D  mysql-test/suite/maria/r/maria_notembedded.result
        D  mysql-test/suite/maria/r/maria_partition.result
        D  mysql-test/suite/maria/r/maria_showlog_error.result
        D  mysql-test/suite/maria/r/ps_maria.result
        D  mysql-test/suite/maria/t/
        D  mysql-test/suite/maria/t/disabled.def
        D  mysql-test/suite/maria/t/maria-autozerofill-master.opt
        D  mysql-test/suite/maria/t/maria-autozerofill.test
        D  mysql-test/suite/maria/t/maria-big.test
        D  mysql-test/suite/maria/t/maria-big2.test
        D  mysql-test/suite/maria/t/maria-connect.test
        D  mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test
        D  mysql-test/suite/maria/t/maria-gis-rtree-trans.test
        D  mysql-test/suite/maria/t/maria-gis-rtree.test
        D  mysql-test/suite/maria/t/maria-lock.test
        D  mysql-test/suite/maria/t/maria-mvcc.test
        D  mysql-test/suite/maria/t/maria-no-logging-master.opt
        D  mysql-test/suite/maria/t/maria-no-logging.test
        D  mysql-test/suite/maria/t/maria-page-checksum.test
        D  mysql-test/suite/maria/t/maria-preload-master.opt
        D  mysql-test/suite/maria/t/maria-preload.test
        D  mysql-test/suite/maria/t/maria-purge.test
        D  mysql-test/suite/maria/t/maria-recover-master.opt
        D  mysql-test/suite/maria/t/maria-recover.test
        D  mysql-test/suite/maria/t/maria-recovery-big-master.opt
        D  mysql-test/suite/maria/t/maria-recovery-big.test
        D  mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt
        D  mysql-test/suite/maria/t/maria-recovery-bitmap.test
        D  mysql-test/suite/maria/t/maria-recovery-master.opt
        D  mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt
        D  mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
        D  mysql-test/suite/maria/t/maria-recovery.test
        D  mysql-test/suite/maria/t/maria-recovery2-master.opt
        D  mysql-test/suite/maria/t/maria-recovery2.test
        D  mysql-test/suite/maria/t/maria-recovery3-master.opt
        D  mysql-test/suite/maria/t/maria-recovery3.test
        D  mysql-test/suite/maria/t/maria.test
        D  mysql-test/suite/maria/t/maria2.test
        D  mysql-test/suite/maria/t/maria3.test
        D  mysql-test/suite/maria/t/maria4.test
        D  mysql-test/suite/maria/t/maria_mrr.test
        D  mysql-test/suite/maria/t/maria_notembedded.test
        D  mysql-test/suite/maria/t/maria_partition.test
        D  mysql-test/suite/maria/t/maria_showlog_error.test
        D  mysql-test/suite/maria/t/ps_maria.test
        D  mysql-test/suite/parts/r/partition_alter2_1_maria.result
        D  mysql-test/suite/parts/r/partition_alter2_2_maria.result
        D  mysql-test/suite/parts/r/partition_auto_increment_falcon.result
        D  mysql-test/suite/parts/r/partition_auto_increment_maria.result
        D  mysql-test/suite/parts/t/partition_alter2_1_maria.test
        D  mysql-test/suite/parts/t/partition_alter2_2_maria.test
        D  mysql-test/suite/parts/t/partition_auto_increment_falcon.test
        D  mysql-test/suite/parts/t/partition_auto_increment_maria.test
        D  mysql-test/suite/rpl/r/rpl_extraCol_falcon.result
        D  mysql-test/suite/rpl/r/rpl_extraColmaster_falcon.result
        D  mysql-test/suite/rpl/r/rpl_locktrans_falcon.result
        D  mysql-test/suite/rpl/r/rpl_relay_space_falcon.result
        D  mysql-test/suite/rpl/r/rpl_row_blob_falcon.result
        D  mysql-test/suite/rpl/r/rpl_row_record_find_falcon.result
        D  mysql-test/suite/rpl/r/rpl_stm_maria.result
        D  mysql-test/suite/rpl/r/rpl_truncate_falcon.result
        D  mysql-test/suite/rpl/t/rpl_extraCol_falcon.test
        D  mysql-test/suite/rpl/t/rpl_extraColmaster_falcon.test
        D  mysql-test/suite/rpl/t/rpl_locktrans_falcon.test
        D  mysql-test/suite/rpl/t/rpl_relay_space_falcon.test
        D  mysql-test/suite/rpl/t/rpl_row_blob_falcon.test
        D  mysql-test/suite/rpl/t/rpl_row_record_find_falcon.test
        D  mysql-test/suite/rpl/t/rpl_stm_maria.test
        D  mysql-test/suite/rpl/t/rpl_truncate_falcon.test
        D  mysql-test/t/partition_falcon.test
        D  storage/falcon/
        D  storage/falcon/Agent.cpp
        D  storage/falcon/Agent.h
        D  storage/falcon/Alias.cpp
        D  storage/falcon/Alias.h
        D  storage/falcon/AppEvent.cpp
        D  storage/falcon/AppEvent.h
        D  storage/falcon/Application.cpp
        D  storage/falcon/Application.h
        D  storage/falcon/Applications.cpp
        D  storage/falcon/Applications.h
        D  storage/falcon/Args.cpp
        D  storage/falcon/Args.h
        D  storage/falcon/ArgsException.cpp
        D  storage/falcon/ArgsException.h
        D  storage/falcon/AsciiBlob.cpp
        D  storage/falcon/AsciiBlob.h
        D  storage/falcon/BDB.cpp
        D  storage/falcon/BDB.h
        D  storage/falcon/BackLog.cpp
        D  storage/falcon/BackLog.h
        D  storage/falcon/Backup.cpp
        D  storage/falcon/Backup.h
        D  storage/falcon/BigInt.cpp
        D  storage/falcon/BigInt.h
        D  storage/falcon/BigInteger.cpp
        D  storage/falcon/BigInteger.h
        D  storage/falcon/BinaryBlob.cpp
        D  storage/falcon/BinaryBlob.h
        D  storage/falcon/Bitmap.cpp
        D  storage/falcon/Bitmap.h
        D  storage/falcon/Blob.h
        D  storage/falcon/BlobReference.cpp
        D  storage/falcon/BlobReference.h
        D  storage/falcon/Btn.cpp
        D  storage/falcon/Btn.h
        D  storage/falcon/CMakeLists.txt
        D  storage/falcon/Cache.cpp
        D  storage/falcon/Cache.h
        D  storage/falcon/CmdGen.cpp
        D  storage/falcon/CmdGen.h
        D  storage/falcon/Collation.cpp
        D  storage/falcon/Collation.h
        D  storage/falcon/CollationCaseless.cpp
        D  storage/falcon/CollationCaseless.h
        D  storage/falcon/CollationManager.cpp
        D  storage/falcon/CollationManager.h
        D  storage/falcon/CollationUnknown.cpp
        D  storage/falcon/CollationUnknown.h
        D  storage/falcon/CompareAndSwapSparc.h
        D  storage/falcon/CompareAndSwapSparc.il
        D  storage/falcon/CompiledStatement.cpp
        D  storage/falcon/CompiledStatement.h
        D  storage/falcon/Configuration.cpp
        D  storage/falcon/Configuration.h
        D  storage/falcon/Connection.cpp
        D  storage/falcon/Connection.h
        D  storage/falcon/Context.cpp
        D  storage/falcon/Context.h
        D  storage/falcon/ControlBreak.cpp
        D  storage/falcon/ControlBreak.h
        D  storage/falcon/Coterie.cpp
        D  storage/falcon/Coterie.h
        D  storage/falcon/CoterieRange.cpp
        D  storage/falcon/CoterieRange.h
        D  storage/falcon/Crypto.cpp
        D  storage/falcon/Crypto.h
        D  storage/falcon/CycleLock.cpp
        D  storage/falcon/CycleLock.h
        D  storage/falcon/CycleManager.cpp
        D  storage/falcon/CycleManager.h
        D  storage/falcon/DataOutputStream.cpp
        D  storage/falcon/DataOutputStream.h
        D  storage/falcon/DataOverflowPage.cpp
        D  storage/falcon/DataOverflowPage.h
        D  storage/falcon/DataPage.cpp
        D  storage/falcon/DataPage.h
        D  storage/falcon/DataResourceLocator.cpp
        D  storage/falcon/DataResourceLocator.h
        D  storage/falcon/Database.cpp
        D  storage/falcon/Database.h
        D  storage/falcon/DatabaseBackup.cpp
        D  storage/falcon/DatabaseBackup.h
        D  storage/falcon/DatabaseClone.cpp
        D  storage/falcon/DatabaseClone.h
        D  storage/falcon/DatabaseCopy.cpp
        D  storage/falcon/DatabaseCopy.h
        D  storage/falcon/DatabaseMetaData.cpp
        D  storage/falcon/DatabaseMetaData.h
        D  storage/falcon/DateTime.cpp
        D  storage/falcon/DateTime.h
        D  storage/falcon/Dbb.cpp
        D  storage/falcon/Dbb.h
        D  storage/falcon/Debug.cpp
        D  storage/falcon/Debug.h
        D  storage/falcon/Decompress.cpp
        D  storage/falcon/Decompress.h
        D  storage/falcon/DeferredIndex.cpp
        D  storage/falcon/DeferredIndex.h
        D  storage/falcon/DeferredIndexWalker.cpp
        D  storage/falcon/DeferredIndexWalker.h
        D  storage/falcon/DenseArray.h
        D  storage/falcon/Digest.cpp
        D  storage/falcon/Digest.h
        D  storage/falcon/EditString.cpp
        D  storage/falcon/EditString.h
        D  storage/falcon/EncodedDataStream.cpp
        D  storage/falcon/EncodedDataStream.h
        D  storage/falcon/EncodedRecord.cpp
        D  storage/falcon/EncodedRecord.h
        D  storage/falcon/Engine.dep
        D  storage/falcon/Engine.dsp
        D  storage/falcon/Engine.dsw
        D  storage/falcon/Engine.h
        D  storage/falcon/Engine.vcproj
        D  storage/falcon/Error.cpp
        D  storage/falcon/Error.h
        D  storage/falcon/ErrorInjector.cpp
        D  storage/falcon/ErrorInjector.h
        D  storage/falcon/Event.cpp
        D  storage/falcon/Event.h
        D  storage/falcon/Field.cpp
        D  storage/falcon/Field.h
        D  storage/falcon/Filter.cpp
        D  storage/falcon/Filter.h
        D  storage/falcon/FilterDifferences.cpp
        D  storage/falcon/FilterDifferences.h
        D  storage/falcon/FilterSet.cpp
        D  storage/falcon/FilterSet.h
        D  storage/falcon/FilterSetManager.cpp
        D  storage/falcon/FilterSetManager.h
        D  storage/falcon/FilterTree.cpp
        D  storage/falcon/FilterTree.h
        D  storage/falcon/ForeignKey.cpp
        D  storage/falcon/ForeignKey.h
        D  storage/falcon/Format.cpp
        D  storage/falcon/Format.h
        D  storage/falcon/Fsb.cpp
        D  storage/falcon/Fsb.h
        D  storage/falcon/FsbDerivedTable.cpp
        D  storage/falcon/FsbDerivedTable.h
        D  storage/falcon/FsbExhaustive.cpp
        D  storage/falcon/FsbExhaustive.h
        D  storage/falcon/FsbGroup.cpp
        D  storage/falcon/FsbGroup.h
        D  storage/falcon/FsbInversion.cpp
        D  storage/falcon/FsbInversion.h
        D  storage/falcon/FsbJoin.cpp
        D  storage/falcon/FsbJoin.h
        D  storage/falcon/FsbOuterJoin.cpp
        D  storage/falcon/FsbOuterJoin.h
        D  storage/falcon/FsbSieve.cpp
        D  storage/falcon/FsbSieve.h
        D  storage/falcon/FsbSort.cpp
        D  storage/falcon/FsbSort.h
        D  storage/falcon/FsbUnion.cpp
        D  storage/falcon/FsbUnion.h
        D  storage/falcon/GenOption.h
        D  storage/falcon/Gopher.cpp
        D  storage/falcon/Gopher.h
        D  storage/falcon/Hdr.cpp
        D  storage/falcon/Hdr.h
        D  storage/falcon/HdrState.h
        D  storage/falcon/IO.cpp
        D  storage/falcon/IOx.h
        D  storage/falcon/Image.cpp
        D  storage/falcon/Image.h
        D  storage/falcon/ImageManager.cpp
        D  storage/falcon/ImageManager.h
        D  storage/falcon/Images.cpp
        D  storage/falcon/Images.h
        D  storage/falcon/Index.cpp
        D  storage/falcon/Index.h
        D  storage/falcon/Index2Node.cpp
        D  storage/falcon/Index2Node.h
        D  storage/falcon/Index2Page.cpp
        D  storage/falcon/Index2Page.h
        D  storage/falcon/Index2RootPage.cpp
        D  storage/falcon/Index2RootPage.h
        D  storage/falcon/IndexKey.cpp
        D  storage/falcon/IndexKey.cpp.save
        D  storage/falcon/IndexKey.h
        D  storage/falcon/IndexNode.cpp
        D  storage/falcon/IndexNode.h
        D  storage/falcon/IndexPage.cpp
        D  storage/falcon/IndexPage.h
        D  storage/falcon/IndexRootPage.cpp
        D  storage/falcon/IndexRootPage.h
        D  storage/falcon/IndexWalker.cpp
        D  storage/falcon/IndexWalker.h
        D  storage/falcon/InfoTable.cpp
        D  storage/falcon/InfoTable.h
        D  storage/falcon/Interlock.h
        D  storage/falcon/Inversion.cpp
        D  storage/falcon/Inversion.h
        D  storage/falcon/InversionFilter.cpp
        D  storage/falcon/InversionFilter.h
        D  storage/falcon/InversionPage.cpp
        D  storage/falcon/InversionPage.h
        D  storage/falcon/InversionWord.cpp
        D  storage/falcon/InversionWord.h
        D  storage/falcon/JString.cpp
        D  storage/falcon/JString.h
        D  storage/falcon/KeyGen.cpp
        D  storage/falcon/KeyGen.h
        D  storage/falcon/License.cpp
        D  storage/falcon/License.h
        D  storage/falcon/LicenseManager.cpp
        D  storage/falcon/LicenseManager.h
        D  storage/falcon/LicenseProduct.cpp
        D  storage/falcon/LicenseProduct.h
        D  storage/falcon/LicenseToken.cpp
        D  storage/falcon/LicenseToken.h
        D  storage/falcon/LinkedList.cpp
        D  storage/falcon/LinkedList.h
        D  storage/falcon/Log.cpp
        D  storage/falcon/Log.h
        D  storage/falcon/LogLock.cpp
        D  storage/falcon/LogLock.h
        D  storage/falcon/LogStream.cpp
        D  storage/falcon/LogStream.h
        D  storage/falcon/MACAddress.cpp
        D  storage/falcon/MACAddress.h
        D  storage/falcon/Makefile.am
        D  storage/falcon/Manifest.cpp
        D  storage/falcon/Manifest.h
        D  storage/falcon/ManifestClass.cpp
        D  storage/falcon/ManifestClass.h
        D  storage/falcon/ManifestManager.cpp
        D  storage/falcon/ManifestManager.h
        D  storage/falcon/MemControl.cpp
        D  storage/falcon/MemControl.h
        D  storage/falcon/MemFreeBlock.cpp
        D  storage/falcon/MemFreeBlock.h
        D  storage/falcon/MemMgr.cpp
        D  storage/falcon/MemMgr.h
        D  storage/falcon/MemoryManager.h
        D  storage/falcon/MemoryResultSet.cpp
        D  storage/falcon/MemoryResultSet.h
        D  storage/falcon/MemoryResultSetColumn.cpp
        D  storage/falcon/MemoryResultSetColumn.h
        D  storage/falcon/MemoryResultSetMetaData.cpp
        D  storage/falcon/MemoryResultSetMetaData.h
        D  storage/falcon/MetaDataResultSet.cpp
        D  storage/falcon/MetaDataResultSet.h
        D  storage/falcon/Module.cpp
        D  storage/falcon/Module.h
        D  storage/falcon/MsgType.h
        D  storage/falcon/Mutex.cpp
        D  storage/falcon/Mutex.h
        D  storage/falcon/MySQLCollation.cpp
        D  storage/falcon/MySQLCollation.h
        D  storage/falcon/MySqlEnums.h
        D  storage/falcon/NAlias.cpp
        D  storage/falcon/NAlias.h
        D  storage/falcon/NBitSet.cpp
        D  storage/falcon/NBitSet.h
        D  storage/falcon/NBitmap.cpp
        D  storage/falcon/NBitmap.h
        D  storage/falcon/NCast.cpp
        D  storage/falcon/NCast.h
        D  storage/falcon/NConnectionVariable.cpp
        D  storage/falcon/NConnectionVariable.h
        D  storage/falcon/NConstant.cpp
        D  storage/falcon/NConstant.h
        D  storage/falcon/NDelete.cpp
        D  storage/falcon/NDelete.h
        D  storage/falcon/NExists.cpp
        D  storage/falcon/NExists.h
        D  storage/falcon/NField.cpp
        D  storage/falcon/NField.h
        D  storage/falcon/NInSelect.cpp
        D  storage/falcon/NInSelect.h
        D  storage/falcon/NInSelectBitmap.cpp
        D  storage/falcon/NInSelectBitmap.h
        D  storage/falcon/NInsert.cpp
        D  storage/falcon/NInsert.h
        D  storage/falcon/NMatching.cpp
        D  storage/falcon/NMatching.h
        D  storage/falcon/NNode.cpp
        D  storage/falcon/NNode.h
        D  storage/falcon/NParameter.cpp
        D  storage/falcon/NParameter.h
        D  storage/falcon/NRecordNumber.cpp
        D  storage/falcon/NRecordNumber.h
        D  storage/falcon/NRepair.cpp
        D  storage/falcon/NRepair.h
        D  storage/falcon/NReplace.cpp
        D  storage/falcon/NReplace.h
        D  storage/falcon/NSelect.cpp
        D  storage/falcon/NSelect.h
        D  storage/falcon/NSelectExpr.cpp
        D  storage/falcon/NSelectExpr.h
        D  storage/falcon/NSequence.cpp
        D  storage/falcon/NSequence.h
        D  storage/falcon/NStat.cpp
        D  storage/falcon/NStat.h
        D  storage/falcon/NUpdate.cpp
        D  storage/falcon/NUpdate.h
        D  storage/falcon/NetfraVersion.h
        D  storage/falcon/OpSys.cpp
        D  storage/falcon/OpSys.h
        D  storage/falcon/PStatement.cpp
        D  storage/falcon/PStatement.h
        D  storage/falcon/Page.h
        D  storage/falcon/PageInventoryPage.cpp
        D  storage/falcon/PageInventoryPage.h
        D  storage/falcon/PagePrecedence.cpp
        D  storage/falcon/PagePrecedence.h
        D  storage/falcon/PageType.h
        D  storage/falcon/PageWriter.cpp
        D  storage/falcon/PageWriter.h
        D  storage/falcon/Parameter.cpp
        D  storage/falcon/Parameter.h
        D  storage/falcon/Parameters.cpp
        D  storage/falcon/Parameters.h
        D  storage/falcon/PreparedStatement.cpp
        D  storage/falcon/PreparedStatement.h
        D  storage/falcon/PrettyPrint.cpp
        D  storage/falcon/PrettyPrint.h
        D  storage/falcon/Priority.cpp
        D  storage/falcon/Priority.h
        D  storage/falcon/PriorityScheduler.cpp
        D  storage/falcon/PriorityScheduler.h
        D  storage/falcon/PrivType.h
        D  storage/falcon/Privilege.cpp
        D  storage/falcon/Privilege.h
        D  storage/falcon/PrivilegeObject.cpp
        D  storage/falcon/PrivilegeObject.h
        D  storage/falcon/Properties.h
        D  storage/falcon/Protocol.cpp
        D  storage/falcon/Protocol.h
        D  storage/falcon/QueryString.cpp
        D  storage/falcon/QueryString.h
        D  storage/falcon/Queue.h
        D  storage/falcon/RSet.cpp
        D  storage/falcon/RSet.h
        D  storage/falcon/Record.cpp
        D  storage/falcon/Record.h
        D  storage/falcon/RecordGroup.cpp
        D  storage/falcon/RecordGroup.h
        D  storage/falcon/RecordLeaf.cpp
        D  storage/falcon/RecordLeaf.h
        D  storage/falcon/RecordLocatorPage.cpp
        D  storage/falcon/RecordLocatorPage.h
        D  storage/falcon/RecordScavenge.cpp
        D  storage/falcon/RecordScavenge.h
        D  storage/falcon/RecordSection.cpp
        D  storage/falcon/RecordSection.h
        D  storage/falcon/RecordVersion.cpp
        D  storage/falcon/RecordVersion.h
        D  storage/falcon/RecoveryObjects.cpp
        D  storage/falcon/RecoveryObjects.h
        D  storage/falcon/RecoveryPage.cpp
        D  storage/falcon/RecoveryPage.h
        D  storage/falcon/Registry.cpp
        D  storage/falcon/Registry.h
        D  storage/falcon/Repository.cpp
        D  storage/falcon/Repository.h
        D  storage/falcon/RepositoryManager.cpp
        D  storage/falcon/RepositoryManager.h
        D  storage/falcon/RepositoryVolume.cpp
        D  storage/falcon/RepositoryVolume.h
        D  storage/falcon/Resource.h
        D  storage/falcon/ResultList.cpp
        D  storage/falcon/ResultList.h
        D  storage/falcon/ResultSet.cpp
        D  storage/falcon/ResultSet.h
        D  storage/falcon/ResultSetMetaData.cpp
        D  storage/falcon/ResultSetMetaData.h
        D  storage/falcon/Role.cpp
        D  storage/falcon/Role.h
        D  storage/falcon/RoleModel.cpp
        D  storage/falcon/RoleModel.h
        D  storage/falcon/RootPage.cpp
        D  storage/falcon/RootPage.h
        D  storage/falcon/Row.cpp
        D  storage/falcon/Row.h
        D  storage/falcon/SQLDate.cpp
        D  storage/falcon/SQLDate.h
        D  storage/falcon/SQLError.cpp
        D  storage/falcon/SQLError.h
        D  storage/falcon/SQLException.h
        D  storage/falcon/SQLParse.cpp
        D  storage/falcon/SQLParse.h
        D  storage/falcon/SRLBlobDelete.cpp
        D  storage/falcon/SRLBlobDelete.h
        D  storage/falcon/SRLBlobUpdate.cpp
        D  storage/falcon/SRLBlobUpdate.h
        D  storage/falcon/SRLCheckpoint.cpp
        D  storage/falcon/SRLCheckpoint.h
        D  storage/falcon/SRLCommit.cpp
        D  storage/falcon/SRLCommit.h
        D  storage/falcon/SRLCreateIndex.cpp
        D  storage/falcon/SRLCreateIndex.h
        D  storage/falcon/SRLCreateSection.cpp
        D  storage/falcon/SRLCreateSection.h
        D  storage/falcon/SRLCreateTableSpace.cpp
        D  storage/falcon/SRLCreateTableSpace.h
        D  storage/falcon/SRLData.cpp
        D  storage/falcon/SRLData.h
        D  storage/falcon/SRLDataPage.cpp
        D  storage/falcon/SRLDataPage.h
        D  storage/falcon/SRLDelete.cpp
        D  storage/falcon/SRLDelete.h
        D  storage/falcon/SRLDeleteIndex.cpp
        D  storage/falcon/SRLDeleteIndex.h
        D  storage/falcon/SRLDropTable.cpp
        D  storage/falcon/SRLDropTable.h
        D  storage/falcon/SRLDropTableSpace.cpp
        D  storage/falcon/SRLDropTableSpace.h
        D  storage/falcon/SRLFreePage.cpp
        D  storage/falcon/SRLFreePage.h
        D  storage/falcon/SRLIndexAdd.cpp
        D  storage/falcon/SRLIndexAdd.h
        D  storage/falcon/SRLIndexDelete.cpp
        D  storage/falcon/SRLIndexDelete.h
        D  storage/falcon/SRLIndexPage.cpp
        D  storage/falcon/SRLIndexPage.h
        D  storage/falcon/SRLIndexUpdate.cpp
        D  storage/falcon/SRLIndexUpdate.h
        D  storage/falcon/SRLInventoryPage.cpp
        D  storage/falcon/SRLInventoryPage.h
        D  storage/falcon/SRLInversionPage.cpp
        D  storage/falcon/SRLInversionPage.h
        D  storage/falcon/SRLOverflowPages.cpp
        D  storage/falcon/SRLOverflowPages.h
        D  storage/falcon/SRLPrepare.cpp
        D  storage/falcon/SRLPrepare.h
        D  storage/falcon/SRLRecordLocator.cpp
        D  storage/falcon/SRLRecordLocator.h
        D  storage/falcon/SRLRecordStub.cpp
        D  storage/falcon/SRLRecordStub.h
        D  storage/falcon/SRLRollback.cpp
        D  storage/falcon/SRLRollback.h
        D  storage/falcon/SRLSavepointRollback.cpp
        D  storage/falcon/SRLSavepointRollback.h
        D  storage/falcon/SRLSectionLine.cpp
        D  storage/falcon/SRLSectionLine.h
        D  storage/falcon/SRLSectionPage.cpp
        D  storage/falcon/SRLSectionPage.h
        D  storage/falcon/SRLSectionPromotion.cpp
        D  storage/falcon/SRLSectionPromotion.h
        D  storage/falcon/SRLSequence.cpp
        D  storage/falcon/SRLSequence.h
        D  storage/falcon/SRLSequencePage.cpp
        D  storage/falcon/SRLSequencePage.h
        D  storage/falcon/SRLSession.cpp
        D  storage/falcon/SRLSession.h
        D  storage/falcon/SRLSwitchLog.cpp
        D  storage/falcon/SRLSwitchLog.h
        D  storage/falcon/SRLTableSpaces.cpp
        D  storage/falcon/SRLTableSpaces.h
        D  storage/falcon/SRLUpdateBlob.cpp
        D  storage/falcon/SRLUpdateBlob.h
        D  storage/falcon/SRLUpdateIndex.cpp
        D  storage/falcon/SRLUpdateIndex.h
        D  storage/falcon/SRLUpdateRecords.cpp
        D  storage/falcon/SRLUpdateRecords.h
        D  storage/falcon/SRLVersion.cpp
        D  storage/falcon/SRLVersion.h
        D  storage/falcon/SRLWordUpdate.cpp
        D  storage/falcon/SRLWordUpdate.h
        D  storage/falcon/SavePoint.cpp
        D  storage/falcon/SavePoint.h
        D  storage/falcon/ScaledBinary.cpp
        D  storage/falcon/ScaledBinary.h
        D  storage/falcon/Scan.cpp
        D  storage/falcon/Scan.h
        D  storage/falcon/ScanDir.cpp
        D  storage/falcon/ScanDir.h
        D  storage/falcon/ScanType.h
        D  storage/falcon/Scavenger.cpp
        D  storage/falcon/Scavenger.h
        D  storage/falcon/Schedule.cpp
        D  storage/falcon/Schedule.h
        D  storage/falcon/ScheduleElement.cpp
        D  storage/falcon/ScheduleElement.h
        D  storage/falcon/Scheduled.cpp
        D  storage/falcon/Scheduled.h
        D  storage/falcon/Scheduler.cpp
        D  storage/falcon/Scheduler.h
        D  storage/falcon/Schema.cpp
        D  storage/falcon/Schema.h
        D  storage/falcon/Search.cpp
        D  storage/falcon/Search.h
        D  storage/falcon/SearchHit.cpp
        D  storage/falcon/SearchHit.h
        D  storage/falcon/SearchWords.cpp
        D  storage/falcon/SearchWords.h
        D  storage/falcon/Section.cpp
        D  storage/falcon/Section.h
        D  storage/falcon/SectionPage.cpp
        D  storage/falcon/SectionPage.h
        D  storage/falcon/SectionRootPage.cpp
        D  storage/falcon/SectionRootPage.h
        D  storage/falcon/SectorBuffer.cpp
        D  storage/falcon/SectorBuffer.h
        D  storage/falcon/SectorCache.cpp
        D  storage/falcon/SectorCache.h
        D  storage/falcon/Sequence.cpp
        D  storage/falcon/Sequence.h
        D  storage/falcon/SequenceManager.cpp
        D  storage/falcon/SequenceManager.h
        D  storage/falcon/SequencePage.h
        D  storage/falcon/SequenceResultSet.cpp
        D  storage/falcon/SequenceResultSet.h
        D  storage/falcon/SerialLog.cpp
        D  storage/falcon/SerialLog.h
        D  storage/falcon/SerialLogAction.cpp
        D  storage/falcon/SerialLogAction.h
        D  storage/falcon/SerialLogControl.cpp
        D  storage/falcon/SerialLogControl.h
        D  storage/falcon/SerialLogFile.cpp
        D  storage/falcon/SerialLogFile.h
        D  storage/falcon/SerialLogRecord.cpp
        D  storage/falcon/SerialLogRecord.h
        D  storage/falcon/SerialLogTransaction.cpp
        D  storage/falcon/SerialLogTransaction.h
        D  storage/falcon/SerialLogWindow.cpp
        D  storage/falcon/SerialLogWindow.h
        D  storage/falcon/SerialPipe.cpp
        D  storage/falcon/SerialPipe.h
        D  storage/falcon/Serialize.cpp
        D  storage/falcon/Serialize.h
        D  storage/falcon/Server.cpp
        D  storage/falcon/Server.h
        D  storage/falcon/Session.cpp
        D  storage/falcon/Session.h
        D  storage/falcon/SessionManager.cpp
        D  storage/falcon/SessionManager.h
        D  storage/falcon/SessionQueue.cpp
        D  storage/falcon/SessionQueue.h
        D  storage/falcon/Socket.cpp
        D  storage/falcon/Socket.h
        D  storage/falcon/Sort.cpp
        D  storage/falcon/Sort.h
        D  storage/falcon/SortMerge.cpp
        D  storage/falcon/SortMerge.h
        D  storage/falcon/SortRecord.cpp
        D  storage/falcon/SortRecord.h
        D  storage/falcon/SortRun.cpp
        D  storage/falcon/SortRun.h
        D  storage/falcon/SortStream.cpp
        D  storage/falcon/SortStream.h
        D  storage/falcon/SparseArray.h
        D  storage/falcon/Stack.cpp
        D  storage/falcon/Stack.h
        D  storage/falcon/Statement.cpp
        D  storage/falcon/Statement.h
        D  storage/falcon/StorageConnection.cpp
        D  storage/falcon/StorageConnection.h
        D  storage/falcon/StorageDatabase.cpp
        D  storage/falcon/StorageDatabase.h
        D  storage/falcon/StorageEngineInterface.h
        D  storage/falcon/StorageHandler.cpp
        D  storage/falcon/StorageHandler.h
        D  storage/falcon/StorageParameters.h
        D  storage/falcon/StorageTable.cpp
        D  storage/falcon/StorageTable.h
        D  storage/falcon/StorageTableShare.cpp
        D  storage/falcon/StorageTableShare.h
        D  storage/falcon/StorageVersion.h
        D  storage/falcon/Stream.cpp
        D  storage/falcon/Stream.h
        D  storage/falcon/StreamSegment.cpp
        D  storage/falcon/StreamSegment.h
        D  storage/falcon/SymbolManager.cpp
        D  storage/falcon/SymbolManager.h
        D  storage/falcon/Sync.cpp
        D  storage/falcon/Sync.h
        D  storage/falcon/SyncHandler.cpp
        D  storage/falcon/SyncHandler.h
        D  storage/falcon/SyncObject.cpp
        D  storage/falcon/SyncObject.h
        D  storage/falcon/SyncTest.cpp
        D  storage/falcon/SyncTest.h
        D  storage/falcon/SyncWait.h
        D  storage/falcon/SynchronizationObject.h
        D  storage/falcon/Synchronize.cpp
        D  storage/falcon/Synchronize.h
        D  storage/falcon/Syntax.cpp
        D  storage/falcon/Syntax.h
        D  storage/falcon/Table.cpp
        D  storage/falcon/Table.h
        D  storage/falcon/TableAttachment.cpp
        D  storage/falcon/TableAttachment.h
        D  storage/falcon/TableFilter.cpp
        D  storage/falcon/TableFilter.h
        D  storage/falcon/TableSpace.cpp
        D  storage/falcon/TableSpace.h
        D  storage/falcon/TableSpaceManager.cpp
        D  storage/falcon/TableSpaceManager.h
        D  storage/falcon/TextFormat.h
        D  storage/falcon/Thread.cpp
        D  storage/falcon/Thread.h
        D  storage/falcon/ThreadQueue.cpp
        D  storage/falcon/ThreadQueue.h
        D  storage/falcon/Threads.cpp
        D  storage/falcon/Threads.h
        D  storage/falcon/TimeStamp.cpp
        D  storage/falcon/TimeStamp.h
        D  storage/falcon/TimeTest.cpp
        D  storage/falcon/TimeTest.h
        D  storage/falcon/Transaction.cpp
        D  storage/falcon/Transaction.h
        D  storage/falcon/TransactionManager.cpp
        D  storage/falcon/TransactionManager.h
        D  storage/falcon/TransactionState.cpp
        D  storage/falcon/TransactionState.h
        D  storage/falcon/TransformLib/
        D  storage/falcon/TransformLib/BERDecode.cpp
        D  storage/falcon/TransformLib/BERDecode.h
        D  storage/falcon/TransformLib/BEREncode.cpp
        D  storage/falcon/TransformLib/BEREncode.h
        D  storage/falcon/TransformLib/BERException.cpp
        D  storage/falcon/TransformLib/BERException.h
        D  storage/falcon/TransformLib/BERItem.cpp
        D  storage/falcon/TransformLib/BERItem.h
        D  storage/falcon/TransformLib/BERObject.cpp
        D  storage/falcon/TransformLib/BERObject.h
        D  storage/falcon/TransformLib/Base64Transform.cpp
        D  storage/falcon/TransformLib/Base64Transform.h
        D  storage/falcon/TransformLib/DESKeyTransform.cpp
        D  storage/falcon/TransformLib/DESKeyTransform.h
        D  storage/falcon/TransformLib/DESTransform.cpp
        D  storage/falcon/TransformLib/DESTransform.h
        D  storage/falcon/TransformLib/DecodeTransform.h
        D  storage/falcon/TransformLib/DecryptTransform.h
        D  storage/falcon/TransformLib/EncodeTransform.h
        D  storage/falcon/TransformLib/EncryptTransform.h
        D  storage/falcon/TransformLib/FileTransform.cpp
        D  storage/falcon/TransformLib/FileTransform.h
        D  storage/falcon/TransformLib/HexTransform.cpp
        D  storage/falcon/TransformLib/HexTransform.h
        D  storage/falcon/TransformLib/Makefile.am
        D  storage/falcon/TransformLib/NullTransform.cpp
        D  storage/falcon/TransformLib/NullTransform.h
        D  storage/falcon/TransformLib/RSATransform.cpp
        D  storage/falcon/TransformLib/RSATransform.h
        D  storage/falcon/TransformLib/SHATransform.cpp
        D  storage/falcon/TransformLib/SHATransform.h
        D  storage/falcon/TransformLib/StreamTransform.cpp
        D  storage/falcon/TransformLib/StreamTransform.h
        D  storage/falcon/TransformLib/StringTransform.cpp
        D  storage/falcon/TransformLib/StringTransform.h
        D  storage/falcon/TransformLib/Transform.h
        D  storage/falcon/TransformLib/TransformException.cpp
        D  storage/falcon/TransformLib/TransformException.h
        D  storage/falcon/TransformLib/TransformUtil.cpp
        D  storage/falcon/TransformLib/TransformUtil.h
        D  storage/falcon/TransformLib/ZLibTransform.cpp
        D  storage/falcon/TransformLib/ZLibTransform.h
        D  storage/falcon/Trigger.cpp
        D  storage/falcon/Trigger.h
        D  storage/falcon/TriggerRecord.cpp
        D  storage/falcon/TriggerRecord.h
        D  storage/falcon/Types.h
        D  storage/falcon/UnTable.cpp
        D  storage/falcon/UnTable.h
        D  storage/falcon/Unicode.cpp
        D  storage/falcon/Unicode.h
        D  storage/falcon/User.cpp
        D  storage/falcon/User.h
        D  storage/falcon/UserRole.cpp
        D  storage/falcon/UserRole.h
        D  storage/falcon/Validation.cpp
        D  storage/falcon/Validation.h
        D  storage/falcon/Value.cpp
        D  storage/falcon/Value.h
        D  storage/falcon/ValueEx.cpp
        D  storage/falcon/ValueEx.h
        D  storage/falcon/ValueSet.cpp
        D  storage/falcon/ValueSet.h
        D  storage/falcon/Values.cpp
        D  storage/falcon/Values.h
        D  storage/falcon/View.cpp
        D  storage/falcon/View.h
        D  storage/falcon/WString.cpp
        D  storage/falcon/WString.h
        D  storage/falcon/WalkDeferred.cpp
        D  storage/falcon/WalkDeferred.h
        D  storage/falcon/WalkIndex.cpp
        D  storage/falcon/WalkIndex.h
        D  storage/falcon/falcon_probes.d
        D  storage/falcon/falcon_probes.h
        D  storage/falcon/ha_falcon.cpp
        D  storage/falcon/ha_falcon.h
        D  storage/falcon/makesln.bat
        D  storage/falcon/netfra_jni.h
        D  storage/falcon/nodes.h
        D  storage/falcon/plug.in
        D  storage/falcon/snapshot/
        D  storage/falcon/snapshot/JString.cpp
        D  storage/falcon/snapshot/JString.h
        D  storage/falcon/snapshot/Snapshot.cpp
        D  storage/falcon/snapshot/Snapshot.h
        D  storage/falcon/snapshot/Thread.cpp
        D  storage/falcon/snapshot/Thread.h
        D  storage/falcon/snapshot/trace
        D  storage/maria/
        D  storage/maria/CMakeLists.txt
        D  storage/maria/KNOWN_BUGS.txt
        D  storage/maria/Makefile.am
        D  storage/maria/file_formats.txt
        D  storage/maria/ft_maria.c
        D  storage/maria/ha_maria.cc
        D  storage/maria/ha_maria.h
        D  storage/maria/lockman.c
        D  storage/maria/lockman.h
        D  storage/maria/ma_bitmap.c
        D  storage/maria/ma_blockrec.c
        D  storage/maria/ma_blockrec.h
        D  storage/maria/ma_cache.c
        D  storage/maria/ma_changed.c
        D  storage/maria/ma_check.c
        D  storage/maria/ma_check_standalone.h
        D  storage/maria/ma_checkpoint.c
        D  storage/maria/ma_checkpoint.h
        D  storage/maria/ma_checksum.c
        D  storage/maria/ma_close.c
        D  storage/maria/ma_commit.c
        D  storage/maria/ma_commit.h
        D  storage/maria/ma_control_file.c
        D  storage/maria/ma_control_file.h
        D  storage/maria/ma_create.c
        D  storage/maria/ma_dbug.c
        D  storage/maria/ma_delete.c
        D  storage/maria/ma_delete_all.c
        D  storage/maria/ma_delete_table.c
        D  storage/maria/ma_dynrec.c
        D  storage/maria/ma_examine_non_trans_log.c
        D  storage/maria/ma_extra.c
        D  storage/maria/ma_ft_boolean_search.c
        D  storage/maria/ma_ft_nlq_search.c
        D  storage/maria/ma_ft_parser.c
        D  storage/maria/ma_ft_update.c
        D  storage/maria/ma_ftdefs.h
        D  storage/maria/ma_fulltext.h
        D  storage/maria/ma_info.c
        D  storage/maria/ma_init.c
        D  storage/maria/ma_key.c
        D  storage/maria/ma_key_recover.c
        D  storage/maria/ma_key_recover.h
        D  storage/maria/ma_keycache.c
        D  storage/maria/ma_locking.c
        D  storage/maria/ma_loghandler.c
        D  storage/maria/ma_loghandler.h
        D  storage/maria/ma_loghandler_lsn.h
        D  storage/maria/ma_non_trans_log.c
        D  storage/maria/ma_open.c
        D  storage/maria/ma_packrec.c
        D  storage/maria/ma_page.c
        D  storage/maria/ma_pagecache.c
        D  storage/maria/ma_pagecache.h
        D  storage/maria/ma_pagecaches.c
        D  storage/maria/ma_pagecrc.c
        D  storage/maria/ma_panic.c
        D  storage/maria/ma_preload.c
        D  storage/maria/ma_range.c
        D  storage/maria/ma_recovery.c
        D  storage/maria/ma_recovery.h
        D  storage/maria/ma_recovery_util.c
        D  storage/maria/ma_recovery_util.h
        D  storage/maria/ma_rename.c
        D  storage/maria/ma_rfirst.c
        D  storage/maria/ma_rkey.c
        D  storage/maria/ma_rlast.c
        D  storage/maria/ma_rnext.c
        D  storage/maria/ma_rnext_same.c
        D  storage/maria/ma_rprev.c
        D  storage/maria/ma_rrnd.c
        D  storage/maria/ma_rsame.c
        D  storage/maria/ma_rsamepos.c
        D  storage/maria/ma_rt_index.c
        D  storage/maria/ma_rt_index.h
        D  storage/maria/ma_rt_key.c
        D  storage/maria/ma_rt_key.h
        D  storage/maria/ma_rt_mbr.c
        D  storage/maria/ma_rt_mbr.h
        D  storage/maria/ma_rt_split.c
        D  storage/maria/ma_rt_test.c
        D  storage/maria/ma_scan.c
        D  storage/maria/ma_search.c
        D  storage/maria/ma_sort.c
        D  storage/maria/ma_sp_defs.h
        D  storage/maria/ma_sp_key.c
        D  storage/maria/ma_sp_test.c
        D  storage/maria/ma_state.c
        D  storage/maria/ma_state.h
        D  storage/maria/ma_static.c
        D  storage/maria/ma_statrec.c
        D  storage/maria/ma_test1.c
        D  storage/maria/ma_test2.c
        D  storage/maria/ma_test3.c
        D  storage/maria/ma_test_all.res
        D  storage/maria/ma_test_all.sh
        D  storage/maria/ma_test_big.sh
        D  storage/maria/ma_test_force_start.pl
        D  storage/maria/ma_test_recovery
        D  storage/maria/ma_unique.c
        D  storage/maria/ma_update.c
        D  storage/maria/ma_write.c
        D  storage/maria/maria_backup_engine.cc
        D  storage/maria/maria_chk.c
        D  storage/maria/maria_def.h
        D  storage/maria/maria_ftdump.c
        D  storage/maria/maria_non_trans_log.c
        D  storage/maria/maria_pack.c
        D  storage/maria/maria_read_log.c
        D  storage/maria/maria_rename.sh
        D  storage/maria/plug.in
        D  storage/maria/tablockman.c
        D  storage/maria/tablockman.h
        D  storage/maria/test_pack
        D  storage/maria/trnman.c
        D  storage/maria/trnman.h
        D  storage/maria/trnman_public.h
        D  storage/maria/unittest/
        D  storage/maria/unittest/CMakeLists.txt
        D  storage/maria/unittest/Makefile.am
        D  storage/maria/unittest/lockman-t.c
        D  storage/maria/unittest/lockman1-t.c
        D  storage/maria/unittest/lockman2-t.c
        D  storage/maria/unittest/ma_control_file-t.c
        D  storage/maria/unittest/ma_loghandler_examples.c
        D  storage/maria/unittest/ma_maria_log_cleanup.c
        D  storage/maria/unittest/ma_pagecache_consist.c
        D  storage/maria/unittest/ma_pagecache_rwconsist.c
        D  storage/maria/unittest/ma_pagecache_rwconsist2.c
        D  storage/maria/unittest/ma_pagecache_single.c
        D  storage/maria/unittest/ma_test_all-t
        D  storage/maria/unittest/ma_test_loghandler-t.c
        D  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
        D  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
        D  storage/maria/unittest/ma_test_loghandler_multigroup-t.c
        D  storage/maria/unittest/ma_test_loghandler_multithread-t.c
        D  storage/maria/unittest/ma_test_loghandler_noflush-t.c
        D  storage/maria/unittest/ma_test_loghandler_nologs-t.c
        D  storage/maria/unittest/ma_test_loghandler_pagecache-t.c
        D  storage/maria/unittest/ma_test_loghandler_purge-t.c
        D  storage/maria/unittest/ma_test_recovery.expected
        D  storage/maria/unittest/ma_test_recovery.pl
        D  storage/maria/unittest/sequence_storage.c
        D  storage/maria/unittest/sequence_storage.h
        D  storage/maria/unittest/test_file.c
        D  storage/maria/unittest/test_file.h
        D  storage/maria/unittest/trnman-t.c
        A  mysql-test/collections/mysql-azalea.push
        A  mysql-test/include/have_maria.inc
        M  BUILD/SETUP.sh
        M  BUILD/build_mccge.sh
        M  BUILD/compile-dist
        M  Makefile.am
        M  configure.in
        M  extra/Makefile.am
        M  libservices/thd_alloc_service.c
        M  mysql-test/Makefile.am
        M  mysql-test/collections/default.push
        M  mysql-test/mysql-test-run.pl
        M  scripts/make_win_bin_dist
        M  scripts/mysql_system_tables.sql
        M  sql/Makefile.am
        M  sql/mysql_priv.h
        M  sql/scheduler.cc
        M  sql/scheduler.h
        M  sql/sql_connect.cc
        M  storage/myisam/mi_open.c
        M  storage/myisam/plug.in
        M  storage/myisammrg/myrg_open.c
        M  support-files/mysql.spec.sh
        M  tests/mysql_client_test.c
        M  win/configure.js
     2599.149.9 He Zhenxing	2009-05-21
                Post fix of result files after push of BUG#34227

        M  mysql-test/r/debug_sync.result
        M  mysql-test/r/events_bugs.result
        M  mysql-test/r/grant2.result
        M  mysql-test/r/information_schema_db.result
        M  mysql-test/r/sp-security.result
        M  mysql-test/r/trigger_notembedded.result
        M  mysql-test/r/view_grant.result
        M  mysql-test/suite/backup/r/backup_security.result
        M  mysql-test/suite/binlog/r/binlog_grant.result
        M  mysql-test/suite/falcon/r/falcon_tablespace_priv.result
        M  mysql-test/suite/federated/federated_server.result
        M  mysql-test/suite/funcs_1/r/falcon_trig_03e.result
        M  mysql-test/suite/funcs_1/r/innodb_trig_03e.result
        M  mysql-test/suite/funcs_1/r/memory_trig_03e.result
        M  mysql-test/suite/funcs_1/r/myisam_trig_03e.result
        M  mysql-test/suite/funcs_1/r/ndb_trig_03e.result
        M  mysql-test/suite/rpl/r/rpl_temporary.result
        M  mysql-test/suite/sys_vars/r/read_only_func.result
     2599.149.8 He Zhenxing	2009-05-19
                BUG#34227 Replication permission error message is misleading
                
                According to Jon's comment, undo previous patch, and add (at least
                one of) to the error message instead.

        M  mysql-test/r/mysqldump.result
        M  sql/share/errmsg.txt
        M  sql/sp_head.cc
        M  sql/sql_acl.cc
        M  sql/sql_acl.h
        M  sql/sql_parse.cc
     2599.149.7 Luis Soares	2009-05-18 [merge]
                merge: 6.0 --> 6.0-rpl
                manually resolved conflicts: none

        D  BUILD/compile-alpha-ccc
        D  BUILD/compile-alpha-cxx
        D  mysys/make-ccc
        D  regex/make-ccc
        D  storage/heap/make-ccc
        D  storage/maria/ma_ft_eval.c
        D  storage/maria/ma_ft_eval.h
        D  storage/maria/ma_ft_stem.c
        D  storage/maria/ma_ft_test1.c
        D  storage/maria/ma_ft_test1.h
        D  storage/myisam/ft_eval.c
        D  storage/myisam/ft_eval.h
        D  storage/myisam/ft_stem.c
        D  storage/myisam/ft_test1.c
        D  storage/myisam/ft_test1.h
        D  storage/myisam/make-ccc
        D  storage/myisammrg/make-ccc
        D  strings/make-ccc
        A  include/mysql/service_my_snprintf.h
        A  include/mysql/service_thd_alloc.h
        A  include/mysql/services.h
        A  include/service_versions.h
        A  libservices/
        A  libservices/CMakeLists.txt
        A  libservices/Makefile.am
        A  libservices/my_snprintf_service.c
        A  libservices/thd_alloc_service.c
        A  mysql-test/collections/mysql-6.0-maria.push
        A  mysql-test/collections/mysql-6.0-runtime.push
        A  mysql-test/r/drop_debug.result
        A  mysql-test/r/log_state_bug33693.result
        A  mysql-test/t/drop_debug.test
        A  mysql-test/t/log_state_bug33693-master.opt
        A  mysql-test/t/log_state_bug33693.test
        A  sql/sql_plugin_services.h
        M  BUILD/Makefile.am
        M  CMakeLists.txt
        M  Makefile.am
        M  client/mysql.cc
        M  client/mysqltest.cc
        M  client/sql_string.cc
        M  configure.in
        M  include/Makefile.am
        M  include/config-win.h
        M  include/m_string.h
        M  include/maria.h
        M  include/my_bitmap.h
        M  include/my_global.h
        M  include/my_pthread.h
        M  include/myisam.h
        M  include/mysql/plugin.h
        M  include/mysql/plugin.h.pp
        M  libmysqld/Makefile.am
        M  mysql-test/r/log_state.result
        M  mysql-test/r/lowercase_table2.result
        M  mysql-test/r/mysqltest.result
        M  mysql-test/r/parser.result
        M  mysql-test/r/plugin.result
        M  mysql-test/suite/backup/r/backup_logs.result
        M  mysql-test/suite/backup/t/backup_logs.test
        M  mysql-test/t/log_state.test
        M  mysql-test/t/lowercase_table2.test
        M  mysql-test/t/myisam-system.test
        M  mysql-test/t/mysqltest.test
        M  mysql-test/t/parser.test
        M  mysql-test/t/plugin.test
        M  mysys/my_getopt.c
        M  mysys/my_getsystime.c
        M  mysys/my_pthread.c
        M  mysys/safemalloc.c
        M  mysys/typelib.c
        M  mysys/waiting_threads.c
        M  plugin/daemon_example/Makefile.am
        M  scripts/mysqld_safe.sh
        M  sql-common/my_time.c
        M  sql-common/pack.c
        M  sql/CMakeLists.txt
        M  sql/Makefile.am
        M  sql/field.cc
        M  sql/ha_partition.cc
        M  sql/handler.h
        M  sql/item.cc
        M  sql/item.h
        M  sql/item_cmpfunc.cc
        M  sql/item_func.cc
        M  sql/item_strfunc.cc
        M  sql/item_sum.cc
        M  sql/item_sum.h
        M  sql/item_timefunc.cc
        M  sql/log.cc
        M  sql/log_event.h
        M  sql/mysql_priv.h
        M  sql/mysqld.cc
        M  sql/replication.h
        M  sql/set_var.cc
        M  sql/sql_base.cc
        M  sql/sql_bitmap.h
        M  sql/sql_class.cc
        M  sql/sql_class.h
        M  sql/sql_connect.cc
        M  sql/sql_db.cc
        M  sql/sql_delete.cc
        M  sql/sql_lex.cc
        M  sql/sql_parse.cc
        M  sql/sql_partition.cc
        M  sql/sql_plugin.cc
        M  sql/sql_plugin.h
        M  sql/sql_prepare.cc
        M  sql/sql_repl.cc
        M  sql/sql_select.cc
        M  sql/sql_show.cc
        M  sql/sql_string.cc
        M  sql/sql_table.cc
        M  sql/sql_udf.h
        M  sql/sql_yacc.yy
        M  sql/thr_malloc.cc
        M  sql/time.cc
        M  sql/transaction.cc
        M  storage/archive/archive_performance.c
        M  storage/archive/archive_test.c
        M  storage/example/Makefile.am
        M  storage/example/ha_example.cc
        M  storage/falcon/ha_falcon.cpp
        M  storage/maria/Makefile.am
        M  storage/maria/ma_bitmap.c
        M  storage/maria/ma_blockrec.c
        M  storage/maria/ma_create.c
        M  storage/maria/ma_key.c
        M  storage/maria/ma_loghandler.c
        M  storage/maria/ma_loghandler_lsn.h
        M  storage/maria/ma_pagecache.c
        M  storage/maria/ma_recovery.c
        M  storage/maria/maria_backup_engine.cc
        M  storage/maria/maria_def.h
        M  storage/maria/maria_pack.c
        M  storage/maria/trnman.h
        M  storage/maria/unittest/lockman2-t.c
        M  storage/maria/unittest/ma_control_file-t.c
        M  storage/maria/unittest/trnman-t.c
        M  storage/myisam/CMakeLists.txt*
        M  storage/myisam/Makefile.am
        M  storage/myisam/mi_create.c
        M  storage/myisam/myisam_backup_engine.cc
        M  storage/myisam/myisampack.c
        M  storage/mysql_storage_engine.cmake
        M  storage/ndb/src/ndbapi/NdbRecAttr.cpp
        M  strings/ctype-ucs2.c
        M  strings/decimal.c
        M  strings/my_strtoll10.c
        M  strings/my_vsnprintf.c
        M  tests/mysql_client_test.c
     2599.149.6 Alfranio Correia	2009-05-15
                Post-fix for WL#4828.

        M  dbug/dbug.c
        M  include/my_dbug.h
     2599.149.5 Luis Soares	2009-05-15 [merge]
                merge: 6.0 --> 6.0-rpl
                manually resolved conflicts: none
                reverted changes: .bzr-mysql/default.conf

        M  README
        M  mysql-test/include/mtr_check.sql
        M  mysql-test/lib/My/File/Path.pm
        M  mysql-test/lib/My/SafeProcess.pm
        M  mysql-test/lib/My/SafeProcess/Base.pm
        M  mysql-test/lib/mtr_cases.pm
        M  mysql-test/lib/mtr_process.pl
        M  mysql-test/lib/mtr_report.pm
        M  mysql-test/lib/mtr_unique.pm
        M  mysql-test/mysql-test-run.pl
        M  mysql-test/r/init_file.result
        M  mysql-test/suite/funcs_1/datadict/is_routines.inc
        M  mysql-test/suite/funcs_1/r/is_routines.result
        M  mysql-test/t/init_file.test
        M  mysys/safemalloc.c
     2599.149.4 Alfranio Correia	2009-05-15
                vWL#4828 Augment DBUG_ENTER/DBUG_EXIT to crash MySQL in different functions
                
                The assessment of the replication code in the presence of faults is extremely
                import to increase reliability. In particular, one needs to know if servers
                will either correctly recovery or print out appropriate error messages thus
                avoiding unexpected problems in a production environment.
                
                In order to accomplish this, the current patch changes the debug macros
                already provided in the source code and introduces three new macros that
                allows fault-injection, specifically crashes, while entering or exiting
                a function or method. For instance, to crash a server while returning
                from the init_slave function (see module sql/slave.cc), one needs to do
                what follows:
                
                1 - Modify the source replacing DBUG_RETURN by DBUG_CRASH_RETURN;
                
                  DBUG_CRASH_RETURN(0);
                
                2 - Use the debug variable to activate dbug instructions:
                
                  SET SESSION debug="+d,init_slave_crash_return";
                
                The new macros are briefly described below:
                
                DBUG_CRASH_ENTER (function) is equivalent to DBUG_ENTER which registers the
                beginning of a function but in addition to it allows for crashing the server
                while entering the function if the appropriate dbug instruction is activate.
                In this case, the dbug instruction should be "+d,function_crash_enter".
                
                DBUG_CRASH_RETURN (value) is equivalent to DBUG_RETURN which notifies the
                end of a function but in addition to it allows for crashing the server
                while returning from the function if the appropriate dbug instruction is
                activate. In this case, the dbug instruction should be
                "+d,function_crash_return". Note that "function" should be the same string
                used by either the DBUG_ENTER or DBUG_CRASH_ENTER.
                
                DBUG_CRASH_VOID_RETURN (value) is equivalent to DBUG_VOID_RETURN which
                notifies the end of a function but in addition to it allows for crashing
                the server while returning from the function if the appropriate dbug
                instruction is activate. In this case, the dbug instruction should be
                "+d,function_crash_return". Note that "function" should be the same string
                used by either the DBUG_ENTER or DBUG_CRASH_ENTER.
                
                To inject other faults, for instance, wrong return values, one should rely
                on the macros already available. The current patch also removes a set of
                macros that were either not being used or were redundant as other macros
                could be used to provide the same feature. In the future, we also consider
                dynamic instrumentation of the code.
         @ dbug/dbug.c
            1 - _db_keywords_ that concatenates two strings and checks if the result
            string is activated by the dbug instructions. The first string is the name
            of the function and the second string is either "crash_enter" or "crash_return".
            This is used by the new macros: DBUG_CRASH_ENTER, DBUG_CRASH_VOID_RETURN and
            DBUG_CRASH_RETURN.
            
            2 - _db_get_func_ returns the name of the current function. This is used by
            the DBUG_CRASH_VOID_RETURN and DBUG_CRASH_RETURN to automatically figure out
            which is the function they are referencing to.
         @ include/my_dbug.h
            Defines the new macros.
         @ sql/mysql_priv.h
            Removes a set of unused macros.
         @ sql/sql_class.cc
            Removes a set of unused macros.
         @ sql/sql_class.h
            Removes a set of unused macros.
         @ sql/sql_partition.cc
            Localy redefines a macro that was removed to avoid changing the module 
            in several places.

        M  dbug/dbug.c
        M  include/my_dbug.h
        M  sql/mysql_priv.h
        M  sql/sql_class.cc
        M  sql/sql_class.h
        M  sql/sql_partition.cc
     2599.149.3 Luis Soares	2009-05-14 [merge]
                merge: 6.0-rpl bug branch --> 6.0-rpl up-to-date.

        A  mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
        A  mysql-test/include/show_relaylog_events.inc
        A  mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
        A  mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
        A  mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
        A  mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
        M  mysql-test/include/show_binlog_events.inc
        M  sql/lex.h
        M  sql/mysqld.cc
        M  sql/sp_head.cc
        M  sql/sql_lex.h
        M  sql/sql_parse.cc
        M  sql/sql_repl.cc
        M  sql/sql_yacc.yy
         2599.151.1 Luis Soares	2009-05-13
                    BUG#28777: SHOW BINLOG EVENTS does not work on relay log files
                          
                    SHOW BINLOG EVENTS does not work with relay log files. If issuing
                    "SHOW BINLOG EVENTS IN 'relay-log.000001'" in a non-empty relay log
                    file (relay-log.000001), mysql reports empty set.
                          
                    This patch addresses this issue by extending the SHOW command with
                    RELAYLOG. Events in relay log files can now be inspected by issuing
                    SHOW RELAYLOG EVENTS [IN 'log_name'] [FROM pos] 
                    [LIMIT [offset,] row_count].
             @ mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
                Shared part of the test case.
             @ mysql-test/include/show_binlog_events.inc
                Added options $binary_log_file, $binary_log_limit_row, 
                $binary_log_limit_offset so that show_binlog_events can take 
                same parameters as SHOW BINLOG EVENTS does.
             @ mysql-test/include/show_relaylog_events.inc
                Clone of show_binlog_events for relaylog events.
             @ mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
                Test case for row based replication.
             @ mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
                Test case for statement and mixed mode replication.
             @ sql/lex.h
                Added RELAYLOG symbol.
             @ sql/mysqld.cc
                Added "show_relaylog_events" to status_vars.
             @ sql/sp_head.cc
                Set SQLCOM_SHOW_RELAYLOG_EVENTS to return flags=
                sp_head::MULTI_RESULTS; in sp_get_flags_for_command as
                SQLCOM_SHOW_BINLOG_EVENTS does.
             @ sql/sql_lex.h
                Added sql_command SQLCOM_SHOW_RELAYLOG_EVENTS to lex enum_sql_command.
             @ sql/sql_parse.cc
                Added handling of SQLCOM_SHOW_RELAYLOG_EVENTS.
             @ sql/sql_repl.cc
                mysql_show_binlog_events set to choose the log file to use based on
                the command issued (SHOW BINLOG|RELAYLOG EVENTS).
             @ sql/sql_yacc.yy
                Added RELAYLOG to the grammar.

            A  mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
            A  mysql-test/include/show_relaylog_events.inc
            A  mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
            A  mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
            A  mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
            A  mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
            M  mysql-test/include/show_binlog_events.inc
            M  sql/lex.h
            M  sql/mysqld.cc
            M  sql/sp_head.cc
            M  sql/sql_lex.h
            M  sql/sql_parse.cc
            M  sql/sql_repl.cc
            M  sql/sql_yacc.yy
     2599.149.2 Luis Soares	2009-05-13 [merge]
                merge: 6.0-rpl bug branch --> local up-to-date 6.0-rpl

        M  sql/mysqld.cc
         2599.150.1 Luis Soares	2009-05-04
                    BUG#42928: binlog-format setting prevents server from start if binary
                    logging is disabled
                    
                    If one sets binlog-format but does NOT enable binary log, server
                    refuses to start up. The following messages appears in the error log:
                    
                    090217 12:47:14 [ERROR] You need to use --log-bin to make
                    --binlog-format work.  
                    090217 12:47:14 [ERROR] Aborting
                    
                    This patch addresses this by making the server not to bail out if the
                    binlog-format is set without the log-bin option. Additionally, the
                    specified binlog-format is stored, in the global system variable
                    "binlog_format", and a warning is printed instead of an error.

            M  sql/mysqld.cc
     2599.149.1 Luis Soares	2009-05-13
                BUG#43647: Debug message "[Note] new_mode 0" floods slave error log
                
                There was a print out (through sql_print_warning) inside
                handle_slave_sql loop, right before the exec_relay_log_event. This
                would output several entries in mysqld error log, eventually causing
                unexpected exhaustion of disk space. Output line sample:
                      
                "090309 10:25:32 [Note] new_mode 0".
                     
                This patch fixes this by removing the call to sql_print_warning.

        M  sql/slave.cc
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-06-09 14:36:52 +0000
+++ b/.bzr-mysql/default.conf	2009-06-12 03:47:51 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = "bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-pe"
+tree_location = "bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-azalea"
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-pe"
+tree_name = "mysql-azalea"

=== modified file 'dbug/dbug.c'
--- a/dbug/dbug.c	2009-03-25 16:51:28 +0000
+++ b/dbug/dbug.c	2009-05-15 13:43:56 +0000
@@ -1836,6 +1836,27 @@ BOOLEAN _db_keyword_(CODE_STATE *cs, con
 /*
  *  FUNCTION
  *
+ *      _db_keywords_    test keyword formed by a set of strings for member
+ *                       of keyword list
+ *
+ *  DESCRIPTION
+ *
+ *      This function is similar to _db_keyword but receives a set of strings to
+ *      be concatenated in order to make the keyword to be compared.
+ */
+
+BOOLEAN _db_keywords_(CODE_STATE *cs, int strict, const char *function, const char *type)
+{
+  char dest[_DBUG_MAX_FUNC_NAME_ + 1];
+
+  strxnmov(dest, _DBUG_MAX_FUNC_NAME_, function, type, NULL);
+
+  return _db_keyword_(cs, dest, strict);
+}
+
+/*
+ *  FUNCTION
+ *
  *      Indent    indent a line to the given indentation level
  *
  *  SYNOPSIS
@@ -2460,6 +2481,13 @@ void _db_unlock_file_()
   pthread_mutex_unlock(&THR_LOCK_dbug);
 }
 
+const char* _db_get_func_(void)
+{
+  CODE_STATE *cs;
+  get_code_state_or_return NULL;
+  return cs->func;
+}
+
 /*
  * Here we need the definitions of the clock routine.  Add your
  * own for whatever system that you have.

=== modified file 'include/my_dbug.h'
--- a/include/my_dbug.h	2009-05-15 13:45:06 +0000
+++ b/include/my_dbug.h	2009-06-12 02:01:08 +0000
@@ -31,6 +31,8 @@ struct _db_stack_frame_ {
 struct  _db_code_state_;
 extern  my_bool _dbug_on_;
 extern  my_bool _db_keyword_(struct _db_code_state_ *, const char *, int);
+extern  my_bool _db_keywords_(struct _db_code_state_ *, int, const char *,
+                              const char *);
 extern  int _db_explain_(struct _db_code_state_ *cs, char *buf, size_t len);
 extern  int _db_explain_init_(char *buf, size_t len);
 extern	int _db_is_pushed_(void);
@@ -54,6 +56,7 @@ extern  void _db_lock_file_(void);
 extern  void _db_unlock_file_(void);
 extern  FILE *_db_fp_(void);
 extern  void _db_flush_();
+extern  const char* _db_get_func_(void);
 
 #define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_; \
         _db_enter_ (a,__FILE__,__LINE__,&_db_stack_frame_)
@@ -101,6 +104,20 @@ extern  void _db_flush_();
                      (void)_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR),\
                      _exit(3))
 #endif
+#define _DBUG_MAX_FUNC_NAME_ 255
+#define DBUG_CHECK_CRASH(func, op) \
+        do { \
+          if (_db_keywords_(0, 0, (func), (op))) \
+            { (_db_flush_(), abort()); } \
+        } while (0)
+#define DBUG_CRASH_ENTER(func) \
+  DBUG_ENTER(func); DBUG_CHECK_CRASH(func, "_crash_enter")
+#define DBUG_CRASH_RETURN(val) \
+  do {DBUG_CHECK_CRASH(_db_get_func_(), "_crash_return"); \
+    DBUG_RETURN(val);} while(0)
+#define DBUG_CRASH_VOID_RETURN \
+  do {DBUG_CHECK_CRASH (_db_get_func_(), "_crash_return"); \
+    DBUG_VOID_RETURN;} while(0)
 
 #else                                           /* No debugger */
 
@@ -132,6 +149,9 @@ extern  void _db_flush_();
 #define DEBUGGER_ON                     do { } while(0)
 #define IF_DBUG(A)
 #define DBUG_ABORT()                    abort()
+#define DBUG_CRASH_ENTER(func)
+#define DBUG_CRASH_RETURN(val)          do { return(val); } while(0)
+#define DBUG_CRASH_VOID_RETURN          do { return; } while(0)
 
 #endif
 #ifdef  __cplusplus

=== added file 'mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc'
--- a/mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc	2009-05-13 11:04:33 +0000
@@ -0,0 +1,121 @@
+-- connection master
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (3);
+INSERT INTO t1 VALUES (4);
+INSERT INTO t1 VALUES (5);
+INSERT INTO t1 VALUES (6);
+
+-- echo [MASTER] ********* SOW BINLOG EVENTS IN ...  *********
+let $binary_log_file= master-bin.000001;
+-- source include/show_binlog_events.inc
+
+-- echo [MASTER] ********* SOW BINLOG EVENTS         *********
+let $binary_log_file= ;
+-- source include/show_binlog_events.inc
+
+-- echo [MASTER] ********* SOW BINLOG EVENTS ... LIMIT rows  *********
+let $binary_log_file= ;
+let $binary_log_limit_row= 3;
+-- source include/show_binlog_events.inc
+
+-- echo [MASTER] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
+let $binary_log_file= ;
+let $binary_log_limit_row= 3;
+let $binary_log_limit_offset= 1;
+-- source include/show_binlog_events.inc
+
+# clear show_binlog_event/show_relaylog_events parameters
+let $binary_log_file= ;
+let $binary_log_limit_row= ;
+let $binary_log_limit_offset= ;
+
+-- sync_slave_with_master
+
+-- echo [SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
+let $binary_log_file= slave-bin.000001;
+-- source include/show_binlog_events.inc
+
+-- echo [SLAVE] ********* SOW BINLOG EVENTS          *********
+let $binary_log_file= ;
+-- source include/show_binlog_events.inc
+
+-- echo [SLAVE] ********* SOW BINLOG EVENTS ... LIMIT rows  *********
+let $binary_log_file= ;
+let $binary_log_limit_row= 3;
+-- source include/show_binlog_events.inc
+
+-- echo [SLAVE] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
+let $binary_log_file= ;
+let $binary_log_limit_row= 3;
+let $binary_log_limit_offset= 1;
+-- source include/show_binlog_events.inc
+
+# clear show_binlog_event/show_relaylog_events parameters
+let $binary_log_file= ;
+let $binary_log_limit_row= ;
+let $binary_log_limit_offset= ;
+
+-- echo [SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
+let $binary_log_file= slave-relay-bin.000003;
+-- source include/show_relaylog_events.inc
+
+-- echo [SLAVE] ********* SOW RELAYLOG EVENTS        *********
+let $binary_log_file= ;
+-- source include/show_relaylog_events.inc
+
+-- echo [MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT rows  *********
+let $binary_log_file= slave-relay-bin.000003;
+let $binary_log_limit_row= 3;
+let $binary_log_limit_offset= ;
+-- source include/show_relaylog_events.inc
+
+-- echo [MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT offset,rows  *********
+let $binary_log_file= slave-relay-bin.000003;
+let $binary_log_limit_offset= 1;
+let $binary_log_limit_row= 3;
+-- source include/show_relaylog_events.inc
+
+FLUSH LOGS;
+
+-- connection master
+FLUSH LOGS;
+DROP TABLE t1;
+
+# clear show_binlog_event/show_relaylog_events parameters
+let $binary_log_file= ;
+let $binary_log_limit_row= ;
+let $binary_log_limit_offset= ;
+
+-- echo [MASTER] ********* SOW BINLOG EVENTS IN ...  *********
+let $binary_log_file= master-bin.000002;
+-- source include/show_binlog_events.inc
+
+-- echo [MASTER] ********* SOW BINLOG EVENTS         *********
+let $binary_log_file= ;
+-- source include/show_binlog_events.inc
+
+-- sync_slave_with_master
+
+-- echo [SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
+let $binary_log_file= slave-bin.000002;
+-- source include/show_binlog_events.inc
+
+-- echo [SLAVE] ********* SOW BINLOG EVENTS          *********
+let $binary_log_file= ;
+-- source include/show_binlog_events.inc
+
+-- echo [SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
+let $binary_log_file= slave-relay-bin.000005;
+-- source include/show_relaylog_events.inc
+
+-- echo [SLAVE] ********* SOW RELAYLOG EVENTS        *********
+let $binary_log_file= ;
+-- source include/show_relaylog_events.inc
+
+# clear show_binlog_event/show_relaylog_events parameters
+let $binary_log_name= ;
+let $binary_log_limit_row= ;
+let $binary_log_limit_offset= ;

=== modified file 'mysql-test/include/show_binlog_events.inc'
--- a/mysql-test/include/show_binlog_events.inc	2008-09-06 07:22:50 +0000
+++ b/mysql-test/include/show_binlog_events.inc	2009-05-13 11:04:33 +0000
@@ -1,10 +1,35 @@
 # $binlog_start can be set by caller or take a default value
+# $binary_log_file the name of the log file show
+# $binary_log_limit_row - sets the number of binlog rows to be returned
+# $binary_log_limit_offset - sets the offset where to start returning events
+
+let $show_binlog_events= show binlog events;
 
 if (!$binlog_start)
 {
+  # defaults to chop the first event in the binary log
   let $binlog_start=107;
 }
+
+if (!`SELECT '$binary_log_file' = ''`)
+{
+    let $show_binlog_events= $show_binlog_events in '$binary_log_file';
+}
+let $show_binlog_events= $show_binlog_events from $binlog_start;
+
+if ($binary_log_limit_row)
+{
+  let $limit= limit;
+  if ($binary_log_limit_offset)
+  {
+    let $limit= $limit $binary_log_limit_offset, ;
+  }
+
+  let $limit= $limit $binary_log_limit_row;
+  let $show_binlog_events= $show_binlog_events $limit;
+}
+
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/
---eval show binlog events from $binlog_start
+--eval $show_binlog_events

=== added file 'mysql-test/include/show_relaylog_events.inc'
--- a/mysql-test/include/show_relaylog_events.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/show_relaylog_events.inc	2009-05-13 11:04:33 +0000
@@ -0,0 +1,35 @@
+# $binlog_start can be set by caller or take a default value
+# $binary_log_file the name of the log file show
+# $binary_log_limit_row - sets the number of binlog rows to be returned
+# $binary_log_limit_offset - sets the offset where to start returning events
+
+let $show_binlog_events= show relaylog events;
+
+if (!$binlog_start)
+{
+  # defaults to chop the first event in the binary log
+  let $binlog_start=107;
+}
+
+if (!`SELECT '$binary_log_file' = ''`)
+{
+    let $show_binlog_events= $show_binlog_events in '$binary_log_file';
+}
+let $show_binlog_events= $show_binlog_events from $binlog_start;
+
+if ($binary_log_limit_row)
+{
+  let $limit= limit;
+  if ($binary_log_limit_offset)
+  {
+    let $limit= $limit $binary_log_limit_offset, ;
+  }
+
+  let $limit= $limit $binary_log_limit_row;
+  let $show_binlog_events= $show_binlog_events $limit;
+}
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
+--replace_column 2 # 4 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/
+--eval $show_binlog_events

=== modified file 'mysql-test/r/debug_sync.result'
--- a/mysql-test/r/debug_sync.result	2009-06-08 14:58:33 +0000
+++ b/mysql-test/r/debug_sync.result	2009-06-12 02:01:08 +0000
@@ -228,7 +228,7 @@ GRANT ALL ON *.* TO mysqltest_2@localhos
 REVOKE SUPER ON *.* FROM mysqltest_2@localhost;
 connection con1, mysqltest_2
 SET DEBUG_SYNC= 'RESET';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 connection default
 DROP USER mysqltest_2@localhost;
 SET DEBUG_SYNC= 'RESET';

=== modified file 'mysql-test/r/events_bugs.result'
--- a/mysql-test/r/events_bugs.result	2009-05-13 08:42:27 +0000
+++ b/mysql-test/r/events_bugs.result	2009-06-12 02:01:08 +0000
@@ -375,7 +375,7 @@ SELECT event_name, definer FROM INFORMAT
 event_name	definer
 e1	mysqltest_u1@localhost
 ALTER DEFINER=root@localhost EVENT e1 ON SCHEDULE EVERY 1 HOUR;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 event_name	definer
 e1	mysqltest_u1@localhost
@@ -386,7 +386,7 @@ event_name	definer
 e1	mysqltest_u1@localhost
 DROP EVENT e1;
 CREATE DEFINER=root@localhost EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 DROP EVENT e1;
 ERROR HY000: Unknown event 'e1'
 DROP USER mysqltest_u1@localhost;

=== modified file 'mysql-test/r/grant2.result'
--- a/mysql-test/r/grant2.result	2009-02-27 08:20:47 +0000
+++ b/mysql-test/r/grant2.result	2009-05-21 06:25:17 +0000
@@ -121,9 +121,9 @@ mysqltest_5@host5, mysqltest_6@host6, my
 create database mysqltest_1;
 grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost;
 set sql_log_off = 1;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 set sql_log_bin = 0;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 delete from mysql.user where user like 'mysqltest\_1';
 delete from mysql.db where user like 'mysqltest\_1';
 drop database mysqltest_1;

=== modified file 'mysql-test/r/information_schema_db.result'
--- a/mysql-test/r/information_schema_db.result	2009-05-15 15:59:57 +0000
+++ b/mysql-test/r/information_schema_db.result	2009-06-12 02:01:08 +0000
@@ -124,7 +124,7 @@ grant insert on v1 to testdb_2@localhost
 create view v5 as select f1 from t1;
 grant select, show view on v5 to testdb_2@localhost;
 create definer=`no_such_user`@`no_such_host` view v6 as select f1 from t1;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 use testdb_1;
 create view v6 as select f1 from t1;
 grant select, show view on v6 to testdb_2@localhost;

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2009-05-29 16:22:30 +0000
+++ b/mysql-test/r/mysqldump.result	2009-06-12 02:01:08 +0000
@@ -3555,11 +3555,11 @@ use test;
 create user mysqltest_1@localhost;
 create table t1(a int, b varchar(34));
 reset master;
-mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need the RELOAD privilege for this operation (1227)
-mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need the RELOAD privilege for this operation (1227)
+mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
+mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
 grant RELOAD on *.* to mysqltest_1@localhost;
-mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER|REPLICATION CLIENT privilege for this operation (1227)
-mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER|REPLICATION CLIENT privilege for this operation (1227)
+mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER,REPLICATION CLIENT privilege(s) for this operation (1227)
+mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER,REPLICATION CLIENT privilege(s) for this operation (1227)
 grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
 drop table t1;
 drop user mysqltest_1@localhost;

=== modified file 'mysql-test/r/sp-security.result'
--- a/mysql-test/r/sp-security.result	2009-03-06 14:56:17 +0000
+++ b/mysql-test/r/sp-security.result	2009-05-21 06:25:17 +0000
@@ -349,9 +349,9 @@ CREATE FUNCTION wl2897_f1() RETURNS INT 
 ---> connection: mysqltest_1_con
 USE mysqltest;
 CREATE DEFINER=root@localhost PROCEDURE wl2897_p2() SELECT 2;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 CREATE DEFINER=root@localhost FUNCTION wl2897_f2() RETURNS INT RETURN 2;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 
 ---> connection: mysqltest_2_con
 use mysqltest;

=== modified file 'mysql-test/r/trigger_notembedded.result'
--- a/mysql-test/r/trigger_notembedded.result	2009-02-16 14:47:53 +0000
+++ b/mysql-test/r/trigger_notembedded.result	2009-05-21 06:25:17 +0000
@@ -117,7 +117,7 @@ CREATE DEFINER='mysqltest_inv'@'localhos
   TRIGGER trg1 BEFORE INSERT ON t1
 FOR EACH ROW
 SET @new_sum = 0;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 
 ---> connection: default
 use mysqltest_db1;

=== modified file 'mysql-test/r/view_grant.result'
--- a/mysql-test/r/view_grant.result	2009-05-15 13:45:06 +0000
+++ b/mysql-test/r/view_grant.result	2009-06-12 02:01:08 +0000
@@ -16,7 +16,7 @@ create table mysqltest.t2 (a int, b int)
 grant select on mysqltest.t1 to mysqltest_1@localhost;
 grant create view,select on test.* to mysqltest_1@localhost;
 create definer=root@localhost view v1 as select * from mysqltest.t1;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 create view v1 as select * from mysqltest.t1;
 alter view v1 as select * from mysqltest.t1;
 ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 'v1'
@@ -783,7 +783,7 @@ ERROR 42000: CREATE VIEW command denied 
 ALTER VIEW v2 AS SELECT f2 FROM t1;
 ERROR 42000: DROP command denied to user 'u26813'@'localhost' for table 'v2'
 ALTER VIEW v3 AS SELECT f2 FROM t1;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 SHOW CREATE VIEW v3;
 View	Create View	character_set_client	collation_connection
 v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`f1` AS `f1` from `t1`	latin1	latin1_swedish_ci
@@ -807,9 +807,9 @@ GRANT DROP, CREATE VIEW ON mysqltest_299
 GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_2@localhost;
 GRANT SELECT ON mysqltest_29908.t1 TO u29908_2@localhost;
 ALTER VIEW v1 AS SELECT f2 FROM t1;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 ALTER VIEW v2 AS SELECT f2 FROM t1;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 ALTER VIEW v1 AS SELECT f2 FROM t1;
 ALTER VIEW v2 AS SELECT f2 FROM t1;
 ALTER VIEW v1 AS SELECT f1 FROM t1;

=== modified file 'mysql-test/suite/backup/r/backup_security.result'
--- a/mysql-test/suite/backup/r/backup_security.result	2008-12-10 23:50:10 +0000
+++ b/mysql-test/suite/backup/r/backup_security.result	2009-05-21 06:25:17 +0000
@@ -24,16 +24,16 @@ backup_id
 default: Connect as user with no rights and attempt backup and restore.
 no_rights: Attempting backup. Should fail with error 1227
 BACKUP DATABASE backup_test to 'bup_no_rights.bak';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 SHOW ERRORS;
 Level	Code	Message
-Error	1227	Access denied; you need the SUPER privilege for this operation
+Error	1227	Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 no_rights: Attempting restore. Should fail with error 1227
 RESTORE FROM 'bup_no_rights.bak';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 SHOW ERRORS;
 Level	Code	Message
-Error	1227	Access denied; you need the SUPER privilege for this operation
+Error	1227	Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 SELECT * FROM backup_test.t1;
 a
 01 Test #1 - super privilege

=== modified file 'mysql-test/suite/binlog/r/binlog_grant.result'
--- a/mysql-test/suite/binlog/r/binlog_grant.result	2008-09-09 10:19:31 +0000
+++ b/mysql-test/suite/binlog/r/binlog_grant.result	2009-05-21 06:25:17 +0000
@@ -13,16 +13,16 @@ set session sql_log_bin = 1;
 set global sql_log_bin = 1;
 ERROR HY000: Variable 'sql_log_bin' is a SESSION variable and can't be used with SET GLOBAL
 set session sql_log_bin = 1;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 **** Variable BINLOG_FORMAT ****
 [root]
 set global binlog_format = row;
 set session binlog_format = row;
 [plain]
 set global binlog_format = row;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 set session binlog_format = row;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 **** Clean up ****
 set global binlog_format = @saved_binlog_format;
 drop user mysqltest_1@localhost;

=== modified file 'mysql-test/suite/federated/federated_server.result'
--- a/mysql-test/suite/federated/federated_server.result	2009-02-02 11:36:03 +0000
+++ b/mysql-test/suite/federated/federated_server.result	2009-05-21 06:25:17 +0000
@@ -197,13 +197,13 @@ select * from federated.t1;
 id	name
 1	this is legitimate
 alter server s1 options (database 'db_bogus');
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 flush tables;
 select * from federated.t1;
 id	name
 1	this is legitimate
 alter server s1 options (database 'db_bogus');
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 flush tables;
 select * from federated.t1;
 id	name
@@ -214,7 +214,7 @@ select * from federated.t1;
 id	name
 2	this is bogus
 drop server if exists 's1';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 create server 's1' foreign data wrapper 'mysql' options
 (HOST '127.0.0.1',
 DATABASE 'db_legitimate',
@@ -223,7 +223,7 @@ PASSWORD '',
 PORT SLAVE_PORT,
 SOCKET '',
 OWNER 'root');
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 drop server 's1';
 create server 's1' foreign data wrapper 'mysql' options
 (HOST '127.0.0.1',

=== modified file 'mysql-test/suite/funcs_1/r/innodb_trig_03e.result'
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2008-08-07 13:38:29 +0000
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2009-05-21 06:25:17 +0000
@@ -1251,7 +1251,7 @@ drop trigger trg1_0;
 create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_0-yes';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 create definer=current_user trigger trg1_1
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
@@ -1284,7 +1284,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON
 create definer=not_ex_user@localhost trigger trg1_3
 after UPDATE on t1 for each row
 set @var1 = 'trig 1_3-yes';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 select current_user;
 current_user
 root@localhost

=== modified file 'mysql-test/suite/funcs_1/r/memory_trig_03e.result'
--- a/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2008-08-07 13:38:29 +0000
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2009-05-21 06:25:17 +0000
@@ -1252,7 +1252,7 @@ drop trigger trg1_0;
 create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_0-yes';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 create definer=current_user trigger trg1_1
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
@@ -1285,7 +1285,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON
 create definer=not_ex_user@localhost trigger trg1_3
 after UPDATE on t1 for each row
 set @var1 = 'trig 1_3-yes';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 select current_user;
 current_user
 root@localhost

=== modified file 'mysql-test/suite/funcs_1/r/myisam_trig_03e.result'
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2008-08-07 13:38:29 +0000
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2009-05-21 06:25:17 +0000
@@ -1252,7 +1252,7 @@ drop trigger trg1_0;
 create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_0-yes';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 create definer=current_user trigger trg1_1
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
@@ -1285,7 +1285,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON
 create definer=not_ex_user@localhost trigger trg1_3
 after UPDATE on t1 for each row
 set @var1 = 'trig 1_3-yes';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 select current_user;
 current_user
 root@localhost

=== modified file 'mysql-test/suite/funcs_1/r/ndb_trig_03e.result'
--- a/mysql-test/suite/funcs_1/r/ndb_trig_03e.result	2008-08-16 05:15:49 +0000
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_03e.result	2009-05-21 06:25:17 +0000
@@ -1251,7 +1251,7 @@ drop trigger trg1_0;
 create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_0-yes';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 create definer=current_user trigger trg1_1
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
@@ -1284,7 +1284,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON
 create definer=not_ex_user@localhost trigger trg1_3
 after UPDATE on t1 for each row
 set @var1 = 'trig 1_3-yes';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 select current_user;
 current_user
 root@localhost

=== added file 'mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result'
--- a/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result	2009-05-13 11:04:33 +0000
@@ -0,0 +1,274 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (3);
+INSERT INTO t1 VALUES (4);
+INSERT INTO t1 VALUES (5);
+INSERT INTO t1 VALUES (6);
+[MASTER] ********* SOW BINLOG EVENTS IN ...  *********
+show binlog events in 'master-bin.000001' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+[MASTER] ********* SOW BINLOG EVENTS         *********
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+[MASTER] ********* SOW BINLOG EVENTS ... LIMIT rows  *********
+show binlog events from <binlog_start> limit 3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+[MASTER] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
+show binlog events from <binlog_start> limit 1,  3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+[SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
+show binlog events in 'slave-bin.000001' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+[SLAVE] ********* SOW BINLOG EVENTS          *********
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+[SLAVE] ********* SOW BINLOG EVENTS ... LIMIT rows  *********
+show binlog events from <binlog_start> limit 3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+[SLAVE] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
+show binlog events from <binlog_start> limit 1,  3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+[SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
+show relaylog events in 'slave-relay-bin.000003' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000003	#	Rotate	#	#	master-bin.000001;pos=4
+slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
+slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-relay-bin.000003	#	Query	#	#	use `test`; BEGIN
+slave-relay-bin.000003	#	Table_map	#	#	table_id: # (test.t1)
+slave-relay-bin.000003	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-relay-bin.000003	#	Query	#	#	use `test`; COMMIT
+slave-relay-bin.000003	#	Query	#	#	use `test`; BEGIN
+slave-relay-bin.000003	#	Table_map	#	#	table_id: # (test.t1)
+slave-relay-bin.000003	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-relay-bin.000003	#	Query	#	#	use `test`; COMMIT
+slave-relay-bin.000003	#	Query	#	#	use `test`; BEGIN
+slave-relay-bin.000003	#	Table_map	#	#	table_id: # (test.t1)
+slave-relay-bin.000003	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-relay-bin.000003	#	Query	#	#	use `test`; COMMIT
+slave-relay-bin.000003	#	Query	#	#	use `test`; BEGIN
+slave-relay-bin.000003	#	Table_map	#	#	table_id: # (test.t1)
+slave-relay-bin.000003	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-relay-bin.000003	#	Query	#	#	use `test`; COMMIT
+slave-relay-bin.000003	#	Query	#	#	use `test`; BEGIN
+slave-relay-bin.000003	#	Table_map	#	#	table_id: # (test.t1)
+slave-relay-bin.000003	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-relay-bin.000003	#	Query	#	#	use `test`; COMMIT
+slave-relay-bin.000003	#	Query	#	#	use `test`; BEGIN
+slave-relay-bin.000003	#	Table_map	#	#	table_id: # (test.t1)
+slave-relay-bin.000003	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-relay-bin.000003	#	Query	#	#	use `test`; COMMIT
+[SLAVE] ********* SOW RELAYLOG EVENTS        *********
+show relaylog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000002	#	Rotate	#	#	slave-relay-bin.000003;pos=4
+[MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT rows  *********
+show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000003	#	Rotate	#	#	master-bin.000001;pos=4
+slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
+slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+[MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT offset,rows  *********
+show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 1,  3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
+slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-relay-bin.000003	#	Query	#	#	use `test`; BEGIN
+FLUSH LOGS;
+FLUSH LOGS;
+DROP TABLE t1;
+[MASTER] ********* SOW BINLOG EVENTS IN ...  *********
+show binlog events in 'master-bin.000002' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE t1
+[MASTER] ********* SOW BINLOG EVENTS         *********
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
+[SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
+show binlog events in 'slave-bin.000002' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000002	#	Query	#	#	use `test`; DROP TABLE t1
+[SLAVE] ********* SOW BINLOG EVENTS          *********
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Query	#	#	use `test`; BEGIN
+slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+slave-bin.000001	#	Query	#	#	use `test`; COMMIT
+slave-bin.000001	#	Rotate	#	#	slave-bin.000002;pos=4
+[SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
+show relaylog events in 'slave-relay-bin.000005' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000005	#	Rotate	#	#	master-bin.000002;pos=4
+slave-relay-bin.000005	#	Rotate	#	#	slave-relay-bin.000006;pos=4
+[SLAVE] ********* SOW RELAYLOG EVENTS        *********
+show relaylog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000005	#	Rotate	#	#	master-bin.000002;pos=4
+slave-relay-bin.000005	#	Rotate	#	#	slave-relay-bin.000006;pos=4

=== added file 'mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result	2009-05-13 11:04:33 +0000
@@ -0,0 +1,148 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (3);
+INSERT INTO t1 VALUES (4);
+INSERT INTO t1 VALUES (5);
+INSERT INTO t1 VALUES (6);
+[MASTER] ********* SOW BINLOG EVENTS IN ...  *********
+show binlog events in 'master-bin.000001' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (4)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (5)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (6)
+[MASTER] ********* SOW BINLOG EVENTS         *********
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (4)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (5)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (6)
+[MASTER] ********* SOW BINLOG EVENTS ... LIMIT rows  *********
+show binlog events from <binlog_start> limit 3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+[MASTER] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
+show binlog events from <binlog_start> limit 1,  3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
+[SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
+show binlog events in 'slave-bin.000001' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (4)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (5)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (6)
+[SLAVE] ********* SOW BINLOG EVENTS          *********
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (4)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (5)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (6)
+[SLAVE] ********* SOW BINLOG EVENTS ... LIMIT rows  *********
+show binlog events from <binlog_start> limit 3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+[SLAVE] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
+show binlog events from <binlog_start> limit 1,  3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
+[SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
+show relaylog events in 'slave-relay-bin.000003' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000003	#	Rotate	#	#	master-bin.000001;pos=4
+slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
+slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-relay-bin.000003	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+slave-relay-bin.000003	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+slave-relay-bin.000003	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
+slave-relay-bin.000003	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (4)
+slave-relay-bin.000003	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (5)
+slave-relay-bin.000003	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (6)
+[SLAVE] ********* SOW RELAYLOG EVENTS        *********
+show relaylog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000002	#	Rotate	#	#	slave-relay-bin.000003;pos=4
+[MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT rows  *********
+show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000003	#	Rotate	#	#	master-bin.000001;pos=4
+slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
+slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+[MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT offset,rows  *********
+show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 1,  3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
+slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-relay-bin.000003	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+FLUSH LOGS;
+FLUSH LOGS;
+DROP TABLE t1;
+[MASTER] ********* SOW BINLOG EVENTS IN ...  *********
+show binlog events in 'master-bin.000002' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE t1
+[MASTER] ********* SOW BINLOG EVENTS         *********
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (4)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (5)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (6)
+master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
+[SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
+show binlog events in 'slave-bin.000002' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000002	#	Query	#	#	use `test`; DROP TABLE t1
+[SLAVE] ********* SOW BINLOG EVENTS          *********
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (3)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (4)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (5)
+slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (6)
+slave-bin.000001	#	Rotate	#	#	slave-bin.000002;pos=4
+[SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
+show relaylog events in 'slave-relay-bin.000005' from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000005	#	Rotate	#	#	master-bin.000002;pos=4
+slave-relay-bin.000005	#	Rotate	#	#	slave-relay-bin.000006;pos=4
+[SLAVE] ********* SOW RELAYLOG EVENTS        *********
+show relaylog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-relay-bin.000005	#	Rotate	#	#	master-bin.000002;pos=4
+slave-relay-bin.000005	#	Rotate	#	#	slave-relay-bin.000006;pos=4

=== modified file 'mysql-test/suite/rpl/r/rpl_temporary.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary.result	2009-05-22 23:44:08 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary.result	2009-06-12 02:01:08 +0000
@@ -27,12 +27,12 @@ Warning	1265	Data truncated for column '
 DROP TABLE t1;
 SET @save_select_limit=@@session.sql_select_limit;
 SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 SELECT @@session.sql_select_limit = @save_select_limit;
 @@session.sql_select_limit = @save_select_limit
 1
 SET @@session.sql_select_limit=10, @@session.sql_log_bin=0;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 SELECT @@session.sql_select_limit = @save_select_limit;
 @@session.sql_select_limit = @save_select_limit
 1

=== added file 'mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test'
--- a/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test	2009-05-13 11:04:33 +0000
@@ -0,0 +1,18 @@
+# BUG#28777 SHOW BINLOG EVENTS does not work on relay log files
+#
+# GOAL
+# ==== 
+# 
+#   Test that SHOW BINLOG EVENTS and the new SHOW RELAYLOG EVENTS works after
+#   the patch, both on master and slave.
+#
+# HOW
+# ===
+#
+#   This test issues SHOW [BINLOG|RELAYLOG] EVENTS both on master and slave after 
+#   some statements have been issued.
+
+-- source include/master-slave.inc
+-- source include/have_binlog_format_row.inc
+
+-- source extra/rpl_tests/rpl_show_relaylog_events.inc

=== added file 'mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test	2009-05-13 11:04:33 +0000
@@ -0,0 +1,18 @@
+# BUG#28777 SHOW BINLOG EVENTS does not work on relay log files
+#
+# GOAL
+# ==== 
+# 
+#   Test that SHOW BINLOG EVENTS and the new SHOW RELAYLOG EVENTS works after
+#   the patch, both on master and slave.
+#
+# HOW
+# ===
+#
+#   This test issues SHOW [BINLOG|RELAYLOG] EVENTS both on master and slave after 
+#   some statements have been issued.
+
+-- source include/master-slave.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
+
+-- source extra/rpl_tests/rpl_show_relaylog_events.inc

=== modified file 'mysql-test/suite/sys_vars/r/read_only_func.result'
--- a/mysql-test/suite/sys_vars/r/read_only_func.result	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/read_only_func.result	2009-05-21 06:25:17 +0000
@@ -20,7 +20,7 @@ id	name
 CREATE user sameea;
 ** Connecting connn using username 'sameea' **
 SET Global read_ONLY=ON;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 CREATE TABLE t2
 (
 id INT NOT NULL auto_increment,

=== modified file 'sql/lex.h'
--- a/sql/lex.h	2009-03-09 14:00:03 +0000
+++ b/sql/lex.h	2009-05-13 11:04:33 +0000
@@ -444,6 +444,7 @@ static SYMBOL symbols[] = {
   { "REDUNDANT",	SYM(REDUNDANT_SYM)},
   { "REFERENCES",	SYM(REFERENCES)},
   { "REGEXP",		SYM(REGEXP)},
+  { "RELAYLOG",         SYM(RELAYLOG_SYM)},
   { "RELAY_LOG_FILE",   SYM(RELAY_LOG_FILE_SYM)},
   { "RELAY_LOG_POS",    SYM(RELAY_LOG_POS_SYM)},
   { "RELAY_THREAD",     SYM(RELAY_THREAD)},

=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2009-06-08 14:58:33 +0000
+++ b/sql/mysql_priv.h	2009-06-12 02:01:08 +0000
@@ -974,100 +974,6 @@ struct Query_cache_query_flags
 #define query_cache_is_cacheable_query(L) 0
 #endif /*HAVE_QUERY_CACHE*/
 
-/*
-  Error injector Macros to enable easy testing of recovery after failures
-  in various error cases.
-*/
-#ifndef ERROR_INJECT_SUPPORT
-
-#define ERROR_INJECT(x) 0
-#define ERROR_INJECT_ACTION(x,action) 0
-#define ERROR_INJECT_CRASH(x) 0
-#define ERROR_INJECT_VALUE(x) 0
-#define ERROR_INJECT_VALUE_ACTION(x,action) 0
-#define ERROR_INJECT_VALUE_CRASH(x) 0
-#define SET_ERROR_INJECT_VALUE(x)
-
-#else
-
-inline bool check_and_unset_keyword(const char *dbug_str)
-{
-  const char *extra_str= "-d,";
-  char total_str[200];
-  if (_db_keyword_ (0, dbug_str, 1))
-  {
-    strxmov(total_str, extra_str, dbug_str, NullS);
-    DBUG_SET(total_str);
-    return 1;
-  }
-  return 0;
-}
-
-
-inline bool
-check_and_unset_inject_value(int value)
-{
-  THD *thd= current_thd;
-  if (thd->error_inject_value == (uint)value)
-  {
-    thd->error_inject_value= 0;
-    return 1;
-  }
-  return 0;
-}
-
-/*
-  ERROR INJECT MODULE:
-  --------------------
-  These macros are used to insert macros from the application code.
-  The event that activates those error injections can be activated
-  from SQL by using:
-  SET SESSION dbug=+d,code;
-
-  After the error has been injected, the macros will automatically
-  remove the debug code, thus similar to using:
-  SET SESSION dbug=-d,code
-  from SQL.
-
-  ERROR_INJECT_CRASH will inject a crash of the MySQL Server if code
-  is set when macro is called. ERROR_INJECT_CRASH can be used in
-  if-statements, it will always return FALSE unless of course it
-  crashes in which case it doesn't return at all.
-
-  ERROR_INJECT_ACTION will inject the action specified in the action
-  parameter of the macro, before performing the action the code will
-  be removed such that no more events occur. ERROR_INJECT_ACTION
-  can also be used in if-statements and always returns FALSE.
-  ERROR_INJECT can be used in a normal if-statement, where the action
-  part is performed in the if-block. The macro returns TRUE if the
-  error was activated and otherwise returns FALSE. If activated the
-  code is removed.
-
-  Sometimes it is necessary to perform error inject actions as a serie
-  of events. In this case one can use one variable on the THD object.
-  Thus one sets this value by using e.g. SET_ERROR_INJECT_VALUE(100).
-  Then one can later test for it by using ERROR_INJECT_CRASH_VALUE,
-  ERROR_INJECT_ACTION_VALUE and ERROR_INJECT_VALUE. This have the same
-  behaviour as the above described macros except that they use the
-  error inject value instead of a code used by DBUG macros.
-*/
-#define SET_ERROR_INJECT_VALUE(x) \
-  current_thd->error_inject_value= (x)
-#define ERROR_INJECT_CRASH(code) \
-  DBUG_EVALUATE_IF(code, (DBUG_ABORT(), 0), 0)
-#define ERROR_INJECT_ACTION(code, action) \
-  (check_and_unset_keyword(code) ? ((action), 0) : 0)
-#define ERROR_INJECT(code) \
-  check_and_unset_keyword(code)
-#define ERROR_INJECT_VALUE(value) \
-  check_and_unset_inject_value(value)
-#define ERROR_INJECT_VALUE_ACTION(value,action) \
-  (check_and_unset_inject_value(value) ? (action) : 0)
-#define ERROR_INJECT_VALUE_CRASH(value) \
-  ERROR_INJECT_VALUE_ACTION(value, (DBUG_ABORT(), 0))
-
-#endif
-
 void write_bin_log(THD *thd, bool clear_error,
                    char const *query, ulong query_length);
 

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-06-09 14:36:52 +0000
+++ b/sql/mysqld.cc	2009-06-12 02:01:08 +0000
@@ -3284,6 +3284,7 @@ SHOW_VAR com_status_vars[]= {
   {"show_processlist",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PROCESSLIST]), SHOW_LONG_STATUS},
   {"show_profile",         (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PROFILE]), SHOW_LONG_STATUS},
   {"show_profiles",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PROFILES]), SHOW_LONG_STATUS},
+  {"show_relaylog_events", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_RELAYLOG_EVENTS]), SHOW_LONG_STATUS},
   {"show_slave_hosts",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_HOSTS]), SHOW_LONG_STATUS},
   {"show_slave_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_STAT]), SHOW_LONG_STATUS},
   {"show_status",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STATUS]), SHOW_LONG_STATUS},
@@ -4035,9 +4036,10 @@ with --log-bin instead.");
   {
     if (opt_binlog_format_id != BINLOG_FORMAT_UNSPEC)
     {
-      sql_print_error("You need to use --log-bin to make "
-                      "--binlog-format work.");
-      unireg_abort(1);
+      sql_print_warning("You need to use --log-bin to make "
+                        "--binlog-format work.");
+
+      global_system_variables.binlog_format= opt_binlog_format_id;
     }
     else
     {

=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2009-06-08 14:58:33 +0000
+++ b/sql/share/errmsg.txt	2009-06-12 02:01:08 +0000
@@ -4620,7 +4620,7 @@ ER_USER_LIMIT_REACHED 42000 
         swe "Anv�are '%-.64s' har �skridit '%s' (nuvarande v�e: %ld)"
 ER_SPECIFIC_ACCESS_DENIED_ERROR 42000 
         nla "Toegang geweigerd. U moet het %-.128s privilege hebben voor deze operatie"
-        eng "Access denied; you need the %-.128s privilege for this operation"
+        eng "Access denied; you need (at least one of) the %-.128s privilege(s) for this operation"
         ger "Kein Zugriff. Hierf�d die Berechtigung %-.128s ben�t"
         ita "Accesso non consentito. Serve il privilegio %-.128s per questa operazione"
         por "Acesso negado. Voc�recisa o privil�o %-.128s para essa opera�"

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2009-06-09 16:53:34 +0000
+++ b/sql/slave.cc	2009-06-12 02:01:08 +0000
@@ -3061,7 +3061,6 @@ log '%s' at position %s, relay log '%s' 
     DBUG_ASSERT(rli->info_thd == thd);
     THD_CHECK_SENTRY(thd);
 
-    sql_print_information("new_mode %u", thd->variables.new_mode);
     if (exec_relay_log_event(thd,rli))
     {
       DBUG_PRINT("info", ("exec_relay_log_event() failed"));

=== modified file 'sql/sp_head.cc'
--- a/sql/sp_head.cc	2009-05-31 12:05:01 +0000
+++ b/sql/sp_head.cc	2009-06-12 02:01:08 +0000
@@ -175,6 +175,7 @@ sp_get_flags_for_command(LEX *lex)
   case SQLCOM_SHOW_AUTHORS:
   case SQLCOM_SHOW_BINLOGS:
   case SQLCOM_SHOW_BINLOG_EVENTS:
+  case SQLCOM_SHOW_RELAYLOG_EVENTS:
   case SQLCOM_SHOW_CHARSETS:
   case SQLCOM_SHOW_COLLATIONS:
   case SQLCOM_SHOW_CONTRIBUTORS:
@@ -1518,7 +1519,7 @@ sp_head::execute_trigger(THD *thd,
   if (!(grant_info->privilege & TRIGGER_ACL))
   {
     char priv_desc[128];
-    get_privilege_desc(priv_desc, sizeof(priv_desc), TRIGGER_ACL, FALSE);
+    get_privilege_desc(priv_desc, sizeof(priv_desc), TRIGGER_ACL);
 
     my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), priv_desc,
              thd->security_ctx->priv_user, thd->security_ctx->host_or_ip,

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2009-06-04 06:27:44 +0000
+++ b/sql/sql_acl.cc	2009-06-12 02:01:08 +0000
@@ -3022,7 +3022,7 @@ int mysql_table_grant(THD *thd, TABLE_LI
       {
         char command[128];
         get_privilege_desc(command, sizeof(command),
-                           table_list->grant.want_privilege, FALSE);
+                           table_list->grant.want_privilege);
         my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
                  command, thd->security_ctx->priv_user,
                  thd->security_ctx->host_or_ip, table_list->alias);
@@ -3993,7 +3993,7 @@ err:
   if (!no_errors)				// Not a silent skip of table
   {
     char command[128];
-    get_privilege_desc(command, sizeof(command), want_access, FALSE);
+    get_privilege_desc(command, sizeof(command), want_access);
     my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
              command,
              sctx->priv_user,
@@ -4149,7 +4149,7 @@ bool check_grant_column(THD *thd, GRANT_
 err:
   rw_unlock(&LOCK_grant);
   char command[128];
-  get_privilege_desc(command, sizeof(command), want_access, FALSE);
+  get_privilege_desc(command, sizeof(command), want_access);
   my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0),
            command,
            sctx->priv_user,
@@ -4311,7 +4311,7 @@ err:
   rw_unlock(&LOCK_grant);
 
   char command[128];
-  get_privilege_desc(command, sizeof(command), want_access, FALSE);
+  get_privilege_desc(command, sizeof(command), want_access);
   /*
     Do not give an error message listing a column name unless the user has
     privilege to see all columns.
@@ -5063,25 +5063,16 @@ static int show_routine_grants(THD* thd,
   return error;
 }
 
-/**
+/*
   Make a clear-text version of the requested privilege.
-
-  @param to         pointer to the buffer
-  @param max_length max length of the description message allowed
-  @param access     privileges to check for access
-  @param any        if TRUE, any of the privileges is sufficient,
-                    if FALSE, all privileges are required
 */
 
-void get_privilege_desc(char *to, uint max_length, ulong access, bool any)
+void get_privilege_desc(char *to, uint max_length, ulong access)
 {
   uint pos;
   char *start=to;
-  char sep=',';
   DBUG_ASSERT(max_length >= 30);		// For end ',' removal
 
-  if (any)
-    sep= '|';
   if (access)
   {
     max_length--;				// Reserve place for end-zero
@@ -5091,7 +5082,7 @@ void get_privilege_desc(char *to, uint m
 	  command_lengths[pos] + (uint) (to-start) < max_length)
       {
 	to= strmov(to, command_array[pos]);
-	*to++= sep;
+	*to++=',';
       }
     }
     to--;					// Remove end ','

=== modified file 'sql/sql_acl.h'
--- a/sql/sql_acl.h	2009-05-29 15:06:21 +0000
+++ b/sql/sql_acl.h	2009-06-12 02:01:08 +0000
@@ -261,7 +261,7 @@ ulong get_column_grant(THD *thd, GRANT_I
                        const char *db_name, const char *table_name,
                        const char *field_name);
 bool mysql_show_grants(THD *thd, LEX_USER *user);
-void get_privilege_desc(char *to, uint max_length, ulong access, bool any);
+void get_privilege_desc(char *to, uint max_length, ulong access);
 void get_mqh(const char *user, const char *host, USER_CONN *uc);
 bool mysql_create_user(THD *thd, List <LEX_USER> &list);
 bool mysql_drop_user(THD *thd, List <LEX_USER> &list);

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2009-06-09 14:36:52 +0000
+++ b/sql/sql_class.cc	2009-06-12 02:01:08 +0000
@@ -503,9 +503,6 @@ THD::THD()
   limit_found_rows= 0;
   row_count_func= -1;
   statement_id_counter= 0UL;
-#ifdef ERROR_INJECT_SUPPORT
-  error_inject_value= 0UL;
-#endif
   // Must be reset to handle error with THD's created for init of mysqld
   lex->current_select= 0;
   start_time=(time_t) 0;

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2009-06-09 14:36:52 +0000
+++ b/sql/sql_class.h	2009-06-12 02:01:08 +0000
@@ -1759,9 +1759,6 @@ public:
   query_id_t query_id;
   ulong      col_access;
 
-#ifdef ERROR_INJECT_SUPPORT
-  ulong      error_inject_value;
-#endif
   /* Statement id is thread-wide. This counter is used to generate ids */
   ulong      statement_id_counter;
   ulong	     rand_saved_seed1, rand_saved_seed2;

=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2009-05-29 08:09:00 +0000
+++ b/sql/sql_lex.h	2009-06-12 02:01:08 +0000
@@ -123,6 +123,7 @@ enum enum_sql_command {
 #endif
   SQLCOM_SHOW_PROFILE, SQLCOM_SHOW_PROFILES,
   SQLCOM_SIGNAL, SQLCOM_RESIGNAL,
+  SQLCOM_SHOW_RELAYLOG_EVENTS, 
 
   /*
     When a command is added here, be sure it's also added in mysqld.cc

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2009-06-08 14:58:33 +0000
+++ b/sql/sql_parse.cc	2009-06-12 02:01:08 +0000
@@ -2375,6 +2375,7 @@ mysql_execute_command(THD *thd)
     res = show_slave_hosts(thd);
     break;
   }
+  case SQLCOM_SHOW_RELAYLOG_EVENTS: /* fall through */
   case SQLCOM_SHOW_BINLOG_EVENTS:
   {
     if (check_global_access(thd, REPL_SLAVE_ACL))
@@ -5577,7 +5578,7 @@ bool check_global_access(THD *thd, ulong
   char command[128];
   if ((thd->security_ctx->master_access & want_access))
     return 0;
-  get_privilege_desc(command, sizeof(command), want_access, TRUE);
+  get_privilege_desc(command, sizeof(command), want_access);
   my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
   return 1;
 #else

=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2009-05-14 21:49:53 +0000
+++ b/sql/sql_partition.cc	2009-05-18 08:41:20 +0000
@@ -41,6 +41,10 @@
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE
 #include "ha_partition.h"
+
+#define ERROR_INJECT_CRASH(code) \
+  DBUG_EVALUATE_IF(code, (DBUG_ABORT(), 0), 0)
+
 /*
   Partition related functions declarations and some static constants;
 */

=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2009-06-09 19:11:12 +0000
+++ b/sql/sql_repl.cc	2009-06-12 02:01:08 +0000
@@ -1695,6 +1695,7 @@ bool mysql_show_binlog_events(THD* thd)
   bool ret = TRUE;
   IO_CACHE log;
   File file = -1;
+  MYSQL_BIN_LOG *binary_log= NULL;
   DBUG_ENTER("mysql_show_binlog_events");
 
   Log_event::init_show_field_list(&field_list);
@@ -1705,14 +1706,30 @@ bool mysql_show_binlog_events(THD* thd)
   Format_description_log_event *description_event= new
     Format_description_log_event(3); /* MySQL 4.0 by default */
 
-  /*
-    Wait for handlers to insert any pending information
-    into the binlog.  For e.g. ndb which updates the binlog asynchronously
-    this is needed so that the uses sees all its own commands in the binlog
-  */
-  ha_binlog_wait(thd);
+  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_SHOW_BINLOG_EVENTS ||
+              thd->lex->sql_command == SQLCOM_SHOW_RELAYLOG_EVENTS);
 
-  if (mysql_bin_log.is_open())
+  /* select wich binary log to use: binlog or relay */
+  if ( thd->lex->sql_command == SQLCOM_SHOW_BINLOG_EVENTS )
+  {
+    /*
+      Wait for handlers to insert any pending information
+      into the binlog.  For e.g. ndb which updates the binlog asynchronously
+      this is needed so that the uses sees all its own commands in the binlog
+    */
+    ha_binlog_wait(thd);
+
+    binary_log= &mysql_bin_log;
+  }
+  else  /* showing relay log contents */
+  {
+    if (!active_mi)
+      DBUG_RETURN(TRUE);
+
+    binary_log= &(active_mi->rli->relay_log);
+  }
+
+  if (binary_log->is_open())
   {
     LEX_MASTER_INFO *lex_mi= &thd->lex->mi;
     SELECT_LEX_UNIT *unit= &thd->lex->unit;
@@ -1720,7 +1737,7 @@ bool mysql_show_binlog_events(THD* thd)
     my_off_t pos = max(BIN_LOG_HEADER_SIZE, lex_mi->pos); // user-friendly
     char search_file_name[FN_REFLEN], *name;
     const char *log_file_name = lex_mi->log_file_name;
-    pthread_mutex_t *log_lock = mysql_bin_log.get_log_lock();
+    pthread_mutex_t *log_lock = binary_log->get_log_lock();
     LOG_INFO linfo;
     Log_event* ev;
 
@@ -1730,13 +1747,13 @@ bool mysql_show_binlog_events(THD* thd)
 
     name= search_file_name;
     if (log_file_name)
-      mysql_bin_log.make_log_name(search_file_name, log_file_name);
+      binary_log->make_log_name(search_file_name, log_file_name);
     else
       name=0;					// Find first log
 
     linfo.index_file_offset = 0;
 
-    if (mysql_bin_log.find_log_pos(&linfo, name, 1))
+    if (binary_log->find_log_pos(&linfo, name, 1))
     {
       errmsg = "Could not find target log";
       goto err;

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2009-06-04 06:27:44 +0000
+++ b/sql/sql_yacc.yy	2009-06-12 02:01:08 +0000
@@ -1033,6 +1033,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  REDUNDANT_SYM
 %token  REFERENCES                    /* SQL-2003-R */
 %token  REGEXP
+%token  RELAYLOG_SYM
 %token  RELAY_LOG_FILE_SYM
 %token  RELAY_LOG_POS_SYM
 %token  RELAY_THREAD
@@ -10744,6 +10745,11 @@ show_param:
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS;
           } opt_limit_clause_init
+        | RELAYLOG_SYM EVENTS_SYM binlog_in binlog_from
+          {
+            LEX *lex= Lex;
+            lex->sql_command= SQLCOM_SHOW_RELAYLOG_EVENTS;
+          } opt_limit_clause_init
         | keys_or_index from_or_in table_ident opt_db where_clause
           {
             LEX *lex= Lex;
@@ -12367,6 +12373,7 @@ keyword_sp:
         | REDO_BUFFER_SIZE_SYM     {}
         | REDOFILE_SYM             {}
         | REDUNDANT_SYM            {}
+        | RELAYLOG_SYM             {}
         | RELAY_LOG_FILE_SYM       {}
         | RELAY_LOG_POS_SYM        {}
         | RELAY_THREAD             {}

Attachment: [text/bzr-bundle] bzr/zhenxing.he@sun.com-20090612034751-dqd4y0bv0iln1yaj.bundle
Thread
bzr commit into mysql-azalea branch (zhenxing.he:3355) He Zhenxing12 Jun