2702 Sergey Petrunia 2008-10-16
Trivial post-merge fix: Keep definitions RECORD::copy_field[_end] in struct record.
modified:
sql/records.h
sql/structs.h
2701 Sergey Petrunia 2008-10-16 [merge]
mysql-6.0 -> mysql-6.0-opt-subqueries merge
removed:
include/mysql_h.ic
libmysql/dll.c
mysql-test/r/concurrent_innodb.result
mysql-test/r/innodb-autoinc.result
mysql-test/r/innodb_bug34300.result
mysql-test/r/innodb_bug35220.result
mysql-test/r/rpl_slave-running.result
mysql-test/r/rpl_slave-stopped.result
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data
mysql-test/suite/falcon/r/falcon_select_excerpt.result
mysql-test/suite/falcon/t/falcon_page_size_1-master.opt
mysql-test/suite/falcon/t/falcon_select_excerpt.test
mysql-test/suite/falcon_team/r/falcon_bug_22166.result
mysql-test/suite/falcon_team/r/falcon_bug_22187.result
mysql-test/suite/falcon_team/r/falcon_bug_23692.result
mysql-test/suite/falcon_team/r/falcon_bug_28006.result
mysql-test/suite/falcon_team/r/read_many_rows_falcon.result
mysql-test/suite/falcon_team/t/falcon_bug_22166.test
mysql-test/suite/falcon_team/t/falcon_bug_22187.test
mysql-test/suite/falcon_team/t/falcon_bug_23692.test
mysql-test/suite/falcon_team/t/falcon_bug_28006.test
mysql-test/suite/falcon_team/t/read_many_rows_falcon.test
mysql-test/suite/funcs_1/r/falcon_storedproc.result
mysql-test/suite/funcs_1/r/memory_storedproc.result
mysql-test/suite/funcs_1/r/myisam_storedproc.result
mysql-test/suite/funcs_1/r/ndb_storedproc.result
mysql-test/suite/funcs_1/t/falcon_storedproc.test
mysql-test/suite/funcs_1/t/innodb_storedproc.test
mysql-test/suite/funcs_1/t/memory_storedproc.test
mysql-test/suite/funcs_1/t/myisam_storedproc.test
mysql-test/suite/funcs_1/t/ndb_storedproc.test
mysql-test/suite/parts/inc/partition_auto_increment.inc
mysql-test/suite/parts/r/partition_auto_increment_innodb.result
mysql-test/suite/parts/r/partition_auto_increment_myisam.result
mysql-test/suite/parts/t/partition_alter2_ndb.test
mysql-test/suite/parts/t/partition_auto_increment_innodb.test
mysql-test/suite/parts/t/partition_auto_increment_myisam.test
mysql-test/suite/rpl/r/rpl_colSize.result
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
mysql-test/suite/rpl/t/rpl_view-slave.opt
mysql-test/t/concurrent_innodb-master.opt
mysql-test/t/concurrent_innodb.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/innodb_bug34300.test
mysql-test/t/innodb_bug35220.test
sql/backup/backup_progress.cc
sql/backup/backup_progress.h
storage/archive/azio.h
added:
include/mysql.h.pp
include/mysql/plugin.h.pp
mysql-test/extra/rpl_tests/rpl_blackhole.test
mysql-test/include/have_case_insensitive_file_system.inc
mysql-test/include/have_lowercase2.inc
mysql-test/include/mysqlbinlog_row_engine.inc
mysql-test/include/ps_ddl_1.inc
mysql-test/include/wait_for_slave_sql_error_and_skip.inc
mysql-test/r/case_insensitive_file_system.require
mysql-test/r/concurrent_innodb_safelog.result
mysql-test/r/concurrent_innodb_unsafelog.result
mysql-test/r/innodb-autoinc.result
mysql-test/r/innodb_bug34300.result
mysql-test/r/innodb_bug35220.result
mysql-test/r/mysqlbinlog_row.result
mysql-test/r/mysqlbinlog_row_big.result
mysql-test/r/mysqlbinlog_row_innodb.result
mysql-test/r/mysqlbinlog_row_myisam.result
mysql-test/r/mysqlbinlog_row_trans.result
mysql-test/r/rpl_slave-running.result
mysql-test/r/rpl_slave-stopped.result
mysql-test/r/skip_log_bin.result
mysql-test/r/test_wl4435.result
mysql-test/std_data/corrupt_t1#P#p1.MYI
mysql-test/std_data/corrupt_t1.MYI
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data
mysql-test/std_data/parts/t1_will_crash#P#p1_first_1024.MYD
mysql-test/std_data/parts/t1_will_crash#P#p2.MYD
mysql-test/std_data/parts/t1_will_crash#P#p2.MYI
mysql-test/std_data/parts/t1_will_crash#P#p3.MYI
mysql-test/std_data/parts/t1_will_crash#P#p4.MYI
mysql-test/std_data/parts/t1_will_crash#P#p6.MYD
mysql-test/std_data/parts/t1_will_crash#P#p6_2.MYD
mysql-test/std_data/parts/t1_will_crash#P#p6_3.MYD
mysql-test/suite/backup/
mysql-test/suite/backup/r/
mysql-test/suite/backup/r/backup_backupdir.result
mysql-test/suite/backup/r/backup_blob.result
mysql-test/suite/backup/r/backup_commit_backup.result
mysql-test/suite/backup/r/backup_concurrent.result
mysql-test/suite/backup/r/backup_db_grants.result
mysql-test/suite/backup/r/backup_default.result
mysql-test/suite/backup/r/backup_logs_output.result
mysql-test/suite/backup/r/backup_securefilepriv.result
mysql-test/suite/backup/r/backup_timeout.result
mysql-test/suite/backup/t/
mysql-test/suite/backup/t/backup_backupdir.test
mysql-test/suite/backup/t/backup_blob.test
mysql-test/suite/backup/t/backup_commit_backup.test
mysql-test/suite/backup/t/backup_concurrent.test
mysql-test/suite/backup/t/backup_db_grants.test
mysql-test/suite/backup/t/backup_default.test
mysql-test/suite/backup/t/backup_logs_output.test
mysql-test/suite/backup/t/backup_securefilepriv-master.opt
mysql-test/suite/backup/t/backup_securefilepriv.test
mysql-test/suite/backup/t/backup_timeout.test
mysql-test/suite/backup/t/disabled.def
mysql-test/suite/backup_engines/combinations
mysql-test/suite/backup_engines/include/
mysql-test/suite/backup_engines/include/backup_engine.inc
mysql-test/suite/backup_engines/include/backup_ptr.inc
mysql-test/suite/backup_engines/include/backup_ptr_commit.inc
mysql-test/suite/backup_engines/include/backup_ptr_objects.inc
mysql-test/suite/backup_engines/include/not_have_falcon.inc
mysql-test/suite/backup_engines/include/not_have_innodb.inc
mysql-test/suite/backup_engines/include/not_have_memory.inc
mysql-test/suite/backup_engines/include/not_have_myisam.inc
mysql-test/suite/backup_engines/r/backup_functions.result
mysql-test/suite/backup_engines/r/backup_procedures.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_row.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_stmt.result
mysql-test/suite/backup_engines/r/backup_ptr_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result
mysql-test/suite/backup_engines/r/backup_ptr_row.result
mysql-test/suite/backup_engines/r/backup_ptr_stmt.result
mysql-test/suite/backup_engines/r/backup_triggers.result
mysql-test/suite/backup_engines/t/backup_functions.test
mysql-test/suite/backup_engines/t/backup_procedures.test
mysql-test/suite/backup_engines/t/backup_ptr_commit_mixed.test
mysql-test/suite/backup_engines/t/backup_ptr_commit_row.test
mysql-test/suite/backup_engines/t/backup_ptr_commit_stmt.test
mysql-test/suite/backup_engines/t/backup_ptr_mixed.test
mysql-test/suite/backup_engines/t/backup_ptr_objects_mixed.test
mysql-test/suite/backup_engines/t/backup_ptr_objects_row.test
mysql-test/suite/backup_engines/t/backup_ptr_objects_stmt.test
mysql-test/suite/backup_engines/t/backup_ptr_row.test
mysql-test/suite/backup_engines/t/backup_ptr_stmt.test
mysql-test/suite/backup_engines/t/backup_triggers.test
mysql-test/suite/binlog/r/binlog_grant.result
mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
mysql-test/suite/binlog/r/binlog_stm_row.result
mysql-test/suite/binlog/t/binlog_grant.test
mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test
mysql-test/suite/binlog/t/binlog_stm_row.test
mysql-test/suite/falcon/r/falcon_bug_22207-big.result
mysql-test/suite/falcon/r/falcon_bug_37668.result
mysql-test/suite/falcon/r/falcon_bug_38304.result
mysql-test/suite/falcon/r/falcon_bug_39692.result
mysql-test/suite/falcon/r/falcon_index_datatypes.result
mysql-test/suite/falcon/r/falcon_online_index.result
mysql-test/suite/falcon/t/falcon_bug_22207-big.test
mysql-test/suite/falcon/t/falcon_bug_37668.test
mysql-test/suite/falcon/t/falcon_bug_38304.test
mysql-test/suite/falcon/t/falcon_bug_39692.test
mysql-test/suite/falcon/t/falcon_index_datatypes.test
mysql-test/suite/falcon/t/falcon_online_index.test
mysql-test/suite/falcon_team/t/test2bug.def
mysql-test/suite/funcs_1/storedproc/param_check.inc
mysql-test/suite/large_tests/r/lock_tables_big.result
mysql-test/suite/large_tests/t/lock_tables_big.test
mysql-test/suite/parts/inc/partition_alter2_2.inc
mysql-test/suite/parts/inc/partition_auto_increment.inc
mysql-test/suite/parts/inc/partition_mgm.inc
mysql-test/suite/parts/r/partition_alter2_2_innodb.result
mysql-test/suite/parts/r/partition_alter2_2_myisam.result
mysql-test/suite/parts/r/partition_auto_increment_archive.result
mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
mysql-test/suite/parts/r/partition_auto_increment_innodb.result
mysql-test/suite/parts/r/partition_auto_increment_memory.result
mysql-test/suite/parts/r/partition_auto_increment_myisam.result
mysql-test/suite/parts/r/partition_auto_increment_ndb.result
mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result
mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result
mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result
mysql-test/suite/parts/r/partition_recover_myisam.result
mysql-test/suite/parts/r/partition_repair_myisam.result
mysql-test/suite/parts/t/partition_alter2_2_innodb.test
mysql-test/suite/parts/t/partition_alter2_2_myisam.test
mysql-test/suite/parts/t/partition_auto_increment_archive.test
mysql-test/suite/parts/t/partition_auto_increment_blackhole.test
mysql-test/suite/parts/t/partition_auto_increment_innodb.test
mysql-test/suite/parts/t/partition_auto_increment_memory.test
mysql-test/suite/parts/t/partition_auto_increment_myisam.test
mysql-test/suite/parts/t/partition_auto_increment_ndb.test
mysql-test/suite/parts/t/partition_mgm_lc0_archive.test
mysql-test/suite/parts/t/partition_mgm_lc0_innodb.test
mysql-test/suite/parts/t/partition_mgm_lc0_memory.test
mysql-test/suite/parts/t/partition_mgm_lc0_myisam.test
mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test
mysql-test/suite/parts/t/partition_mgm_lc1_archive-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_archive.test
mysql-test/suite/parts/t/partition_mgm_lc1_innodb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_innodb.test
mysql-test/suite/parts/t/partition_mgm_lc1_memory-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_memory.test
mysql-test/suite/parts/t/partition_mgm_lc1_myisam-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_myisam.test
mysql-test/suite/parts/t/partition_mgm_lc1_ndb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_ndb.test
mysql-test/suite/parts/t/partition_mgm_lc2_archive-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_archive.test
mysql-test/suite/parts/t/partition_mgm_lc2_innodb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_innodb.test
mysql-test/suite/parts/t/partition_mgm_lc2_memory-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_memory.test
mysql-test/suite/parts/t/partition_mgm_lc2_myisam-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_myisam.test
mysql-test/suite/parts/t/partition_mgm_lc2_ndb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_ndb.test
mysql-test/suite/parts/t/partition_recover_myisam-master.opt
mysql-test/suite/parts/t/partition_recover_myisam.test
mysql-test/suite/parts/t/partition_repair_myisam.test
mysql-test/suite/parts/t/partition_special_innodb-master.opt
mysql-test/suite/rpl/r/rpl_binlog_query_filter_rules.result
mysql-test/suite/rpl/r/rpl_blackhole.result
mysql-test/suite/rpl/r/rpl_colSize.result
mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
mysql-test/suite/rpl/r/rpl_plugin_load.result
mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules-master.opt
mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test
mysql-test/suite/rpl/t/rpl_blackhole.test
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
mysql-test/suite/rpl/t/rpl_plugin_load-master.opt
mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt
mysql-test/suite/rpl/t/rpl_plugin_load.test
mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
mysql-test/suite/rpl_ndb_big/t/rpl_truncate_7ndb_2-master.opt
mysql-test/t/concurrent_innodb_safelog-master.opt
mysql-test/t/concurrent_innodb_safelog.test
mysql-test/t/concurrent_innodb_unsafelog-master.opt
mysql-test/t/concurrent_innodb_unsafelog.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/innodb_bug34300.test
mysql-test/t/innodb_bug35220.test
mysql-test/t/mysqlbinlog_row.test
mysql-test/t/mysqlbinlog_row_big.test
mysql-test/t/mysqlbinlog_row_innodb.test
mysql-test/t/mysqlbinlog_row_myisam.test
mysql-test/t/mysqlbinlog_row_trans.test
mysql-test/t/skip_log_bin-master.opt
mysql-test/t/skip_log_bin.test
mysys/my_winerr.c
mysys/my_winfile.c
sql/mysql_priv.h.pp
sql/records.h
sql/replication.h
sql/rpl_handler.cc
sql/rpl_handler.h
sql/si_logs.cc
sql/si_logs.h
sql/transaction.cc
sql/transaction.h
storage/archive/azio.h
storage/falcon/SyncHandler.cpp
storage/falcon/SyncHandler.h
win/build-vs9.bat
win/build-vs9.bat.moved
win/build-vs9_x64.bat
win/build-vs9_x64.bat.moved
renamed:
mysql-test/r/backup.result => mysql-test/suite/backup/r/backup.result
mysql-test/r/backup_charsets.result => mysql-test/suite/backup/r/backup_charsets.result
mysql-test/r/backup_commit_blocker.result => mysql-test/suite/backup/r/backup_commit_blocker.result
mysql-test/r/backup_commit_restore.result => mysql-test/suite/backup/r/backup_commit_restore.result
mysql-test/r/backup_compression.result => mysql-test/suite/backup/r/backup_compression.result
mysql-test/r/backup_ddl_blocker.result => mysql-test/suite/backup/r/backup_ddl_blocker.result
mysql-test/r/backup_errors.result => mysql-test/suite/backup/r/backup_errors.result
mysql-test/r/backup_fkey.result => mysql-test/suite/backup/r/backup_fkey.result
mysql-test/r/backup_lock_myisam.result => mysql-test/suite/backup/r/backup_lock_myisam.result
mysql-test/r/backup_many_dbs.result => mysql-test/suite/backup/r/backup_many_dbs.result
mysql-test/r/backup_multi_blocks.result => mysql-test/suite/backup/r/backup_multi_blocks.result
mysql-test/r/backup_myisam1.result => mysql-test/suite/backup/r/backup_myisam1.result
mysql-test/r/backup_myisam2.result => mysql-test/suite/backup/r/backup_myisam2.result
mysql-test/r/backup_no_be.result => mysql-test/suite/backup/r/backup_no_be.result
mysql-test/r/backup_no_data.result => mysql-test/suite/backup/r/backup_no_data.result
mysql-test/r/backup_no_engine.result => mysql-test/suite/backup/r/backup_no_engine.result
mysql-test/r/backup_nodata_driver.result => mysql-test/suite/backup/r/backup_nodata_driver.result
mysql-test/r/backup_objects.result => mysql-test/suite/backup/r/backup_objects.result
mysql-test/r/backup_procedures.result => mysql-test/suite/backup/r/backup_procedures.result
mysql-test/r/backup_progress.result => mysql-test/suite/backup/r/backup_logs.result
mysql-test/r/backup_security.result => mysql-test/suite/backup/r/backup_security.result
mysql-test/r/backup_snapshot.result => mysql-test/suite/backup/r/backup_snapshot.result
mysql-test/r/backup_tablespace.result => mysql-test/suite/backup/r/backup_tablespace.result
mysql-test/r/backup_triggers_and_events.result => mysql-test/suite/backup/r/backup_triggers_and_events.result
mysql-test/r/backup_view_on_view.result => mysql-test/suite/backup/r/backup_view_on_view.result
mysql-test/r/backup_views.result => mysql-test/suite/backup/r/backup_views.result
mysql-test/suite/backup => mysql-test/suite/backup_engines
mysql-test/suite/falcon_team/r/falcon_bug_22165.result => mysql-test/suite/falcon/r/falcon_bug_22165.result
mysql-test/suite/falcon_team/r/falcon_bug_22173.result => mysql-test/suite/falcon/r/falcon_bug_22173.result
mysql-test/suite/falcon_team/r/falcon_bug_22173a.result => mysql-test/suite/falcon/r/falcon_bug_22173a.result
mysql-test/suite/falcon_team/r/falcon_bug_22189.result => mysql-test/suite/falcon/r/falcon_bug_22189.result
mysql-test/suite/falcon_team/r/falcon_bug_22207.result => mysql-test/suite/falcon/r/falcon_bug_22207.result
mysql-test/suite/falcon_team/r/falcon_bug_23189.result => mysql-test/suite/falcon/r/falcon_bug_23189.result
mysql-test/suite/falcon_team/r/falcon_bug_23945.result => mysql-test/suite/falcon/r/falcon_bug_23945.result
mysql-test/suite/falcon_team/r/falcon_bug_24024.result => mysql-test/suite/falcon/r/falcon_bug_24024.result
mysql-test/suite/falcon_team/r/falcon_bug_30282.result => mysql-test/suite/falcon/r/falcon_bug_30282.result
mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result => mysql-test/suite/falcon/r/falcon_bug_30480_A.result
mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result => mysql-test/suite/falcon/r/falcon_bug_30480_B.result
mysql-test/suite/falcon_team/r/falcon_bug_30826.result => mysql-test/suite/falcon/r/falcon_bug_30826.result
mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result => mysql-test/suite/falcon/r/falcon_bug_34351_C.result
mysql-test/suite/falcon_team/r/falcon_bug_34892.result => mysql-test/suite/falcon/r/falcon_bug_34892.result
mysql-test/suite/falcon_team/r/ps_8falcon.result => mysql-test/suite/falcon/r/ps_8falcon.result
mysql-test/suite/falcon_team/t/falcon_bug_22165.test => mysql-test/suite/falcon/t/falcon_bug_22165.test
mysql-test/suite/falcon_team/t/falcon_bug_22173.test => mysql-test/suite/falcon/t/falcon_bug_22173.test
mysql-test/suite/falcon_team/t/falcon_bug_22173a.test => mysql-test/suite/falcon/t/falcon_bug_22173a.test
mysql-test/suite/falcon_team/t/falcon_bug_22189.test => mysql-test/suite/falcon/t/falcon_bug_22189.test
mysql-test/suite/falcon_team/t/falcon_bug_22207.test => mysql-test/suite/falcon/t/falcon_bug_22207.test
mysql-test/suite/falcon_team/t/falcon_bug_23189.test => mysql-test/suite/falcon/t/falcon_bug_23189.test
mysql-test/suite/falcon_team/t/falcon_bug_23945.test => mysql-test/suite/falcon/t/falcon_bug_23945.test
mysql-test/suite/falcon_team/t/falcon_bug_24024.test => mysql-test/suite/falcon/t/falcon_bug_24024.test
mysql-test/suite/falcon_team/t/falcon_bug_30282.test => mysql-test/suite/falcon/t/falcon_bug_30282.test
mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test => mysql-test/suite/falcon/t/falcon_bug_30480_A.test
mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test => mysql-test/suite/falcon/t/falcon_bug_30480_B.test
mysql-test/suite/falcon_team/t/falcon_bug_30826.test => mysql-test/suite/falcon/t/falcon_bug_30826.test
mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test => mysql-test/suite/falcon/t/falcon_bug_34351_C.test
mysql-test/suite/falcon_team/t/falcon_bug_34892.test => mysql-test/suite/falcon/t/falcon_bug_34892.test
mysql-test/suite/falcon_team/t/ps_8falcon.test => mysql-test/suite/falcon/t/ps_8falcon.test
mysql-test/suite/funcs_1/r/innodb_storedproc.result => mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc => mysql-test/suite/funcs_1/t/storedproc.test
mysql-test/suite/parts/inc/partition_alter2.inc => mysql-test/suite/parts/inc/partition_alter2_1.inc
mysql-test/suite/parts/r/partition_alter2_innodb.result => mysql-test/suite/parts/r/partition_alter2_1_innodb.result
mysql-test/suite/parts/r/partition_alter2_myisam.result => mysql-test/suite/parts/r/partition_alter2_1_myisam.result
mysql-test/suite/parts/t/partition_alter2_innodb.test => mysql-test/suite/parts/t/partition_alter2_1_innodb.test
mysql-test/suite/parts/t/partition_alter2_myisam.test => mysql-test/suite/parts/t/partition_alter2_1_myisam.test
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result => mysql-test/suite/rpl_ndb_big/r/rpl_truncate_7ndb_2.result
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test => mysql-test/suite/rpl_ndb_big/t/rpl_truncate_7ndb_2.test
mysql-test/t/backup.test => mysql-test/suite/backup/t/backup.test
mysql-test/t/backup_charsets.test => mysql-test/suite/backup/t/backup_charsets.test
mysql-test/t/backup_commit_blocker.test => mysql-test/suite/backup/t/backup_commit_blocker.test
mysql-test/t/backup_commit_restore.test => mysql-test/suite/backup/t/backup_commit_restore.test
mysql-test/t/backup_compression.test => mysql-test/suite/backup/t/backup_compression.test
mysql-test/t/backup_ddl_blocker.test => mysql-test/suite/backup/t/backup_ddl_blocker.test
mysql-test/t/backup_errors.test => mysql-test/suite/backup/t/backup_errors.test
mysql-test/t/backup_fkey.test => mysql-test/suite/backup/t/backup_fkey.test
mysql-test/t/backup_lock_myisam.test => mysql-test/suite/backup/t/backup_lock_myisam.test
mysql-test/t/backup_many_dbs.test => mysql-test/suite/backup/t/backup_many_dbs.test
mysql-test/t/backup_multi_blocks.test => mysql-test/suite/backup/t/backup_multi_blocks.test
mysql-test/t/backup_myisam1-master.opt => mysql-test/suite/backup/t/backup_myisam1-master.opt
mysql-test/t/backup_myisam1.test => mysql-test/suite/backup/t/backup_myisam1.test
mysql-test/t/backup_myisam2.test => mysql-test/suite/backup/t/backup_myisam2.test
mysql-test/t/backup_no_be.test => mysql-test/suite/backup/t/backup_no_be.test
mysql-test/t/backup_no_data.test => mysql-test/suite/backup/t/backup_no_data.test
mysql-test/t/backup_no_engine.test => mysql-test/suite/backup/t/backup_no_engine.test
mysql-test/t/backup_nodata_driver.test => mysql-test/suite/backup/t/backup_nodata_driver.test
mysql-test/t/backup_objects.test => mysql-test/suite/backup/t/backup_objects.test
mysql-test/t/backup_procedures.test => mysql-test/suite/backup/t/backup_procedures.test
mysql-test/t/backup_progress.test => mysql-test/suite/backup/t/backup_logs.test
mysql-test/t/backup_security.test => mysql-test/suite/backup/t/backup_security.test
mysql-test/t/backup_snapshot.opt => mysql-test/suite/backup/t/backup_snapshot.opt
mysql-test/t/backup_snapshot.test => mysql-test/suite/backup/t/backup_snapshot.test
mysql-test/t/backup_tablespace.test => mysql-test/suite/backup/t/backup_tablespace.test
mysql-test/t/backup_triggers_and_events.test => mysql-test/suite/backup/t/backup_triggers_and_events.test
mysql-test/t/backup_view_on_view.test => mysql-test/suite/backup/t/backup_view_on_view.test
mysql-test/t/backup_views.test => mysql-test/suite/backup/t/backup_views.test
modified:
.bzrignore
BUILD/check-cpu
BUILD/compile-solaris-amd64-forte*
BUILD/compile-solaris-amd64-forte-debug
BUILD/compile-solaris-sparc
BUILD/compile-solaris-sparc-forte*
CMakeLists.txt
Makefile.am
client/Makefile.am
client/mysqlbinlog.cc
client/mysqldump.c
client/mysqlslap.c
client/readline.cc
configure.in
extra/CMakeLists.txt
extra/Makefile.am
include/Makefile.am
include/atomic/generic-msvc.h
include/config-win.h
include/hash.h
include/my_dir.h
include/my_global.h
include/my_pthread.h
include/my_sys.h
include/myisam.h
include/mysql.h
include/mysql/plugin.h
include/mysql_com.h
include/thr_lock.h
libmysql/CMakeLists.txt
libmysql/Makefile.am
libmysql/client_settings.h
libmysql/libmysql.c
libmysql/libmysql.def
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
libmysqld/lib_sql.cc
libmysqld/libmysqld.def
man/Makefile.am
mysql-test/Makefile.am
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/binlog_tests/blackhole.test
mysql-test/extra/binlog_tests/database.test
mysql-test/extra/binlog_tests/innodb_stat.test
mysql-test/extra/rpl_tests/rpl_EE_err.test
mysql-test/extra/rpl_tests/rpl_ddl.test
mysql-test/extra/rpl_tests/rpl_log.test
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/include/concurrent.inc
mysql-test/include/grant_cache.inc
mysql-test/include/have_falcon.inc
mysql-test/include/have_lowercase0.inc
mysql-test/include/index_merge1.inc
mysql-test/include/mix1.inc
mysql-test/include/ndb_backup_print.inc
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_report.pl
mysql-test/mysql-test-run.pl
mysql-test/r/1st.result
mysql-test/r/auto_increment.result
mysql-test/r/compare.result
mysql-test/r/connect.result
mysql-test/r/constraints.result
mysql-test/r/create.result
mysql-test/r/csv.result
mysql-test/r/ctype_cp932_binlog_stm.result
mysql-test/r/ctype_latin2_ch.result
mysql-test/r/ctype_ldml.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_utf8.result
mysql-test/r/default.result
mysql-test/r/distinct.result
mysql-test/r/events_2.result
mysql-test/r/events_bugs.result
mysql-test/r/federated.result
mysql-test/r/federated_bug_25714.result
mysql-test/r/func_group.result
mysql-test/r/func_regexp.result
mysql-test/r/grant2.result
mysql-test/r/grant_cache_no_prot.result
mysql-test/r/grant_cache_ps_prot.result
mysql-test/r/group_min_max.result
mysql-test/r/handler_innodb.result
mysql-test/r/have_utf8.require
mysql-test/r/index_merge_myisam.result
mysql-test/r/information_schema.result
mysql-test/r/information_schema_db.result
mysql-test/r/innodb-autoinc-optimize.result
mysql-test/r/innodb-semi-consistent.result
mysql-test/r/innodb.result
mysql-test/r/innodb_mysql.result
mysql-test/r/join.result
mysql-test/r/loaddata.result
mysql-test/r/lock_multi.result
mysql-test/r/log_basic.result
mysql-test/r/log_state.result
mysql-test/r/log_tables.result
mysql-test/r/lowercase0.require
mysql-test/r/maria.result
mysql-test/r/maria2.result
mysql-test/r/maria3.result
mysql-test/r/metadata.result
mysql-test/r/multi_update.result
mysql-test/r/myisam.result
mysql-test/r/mysql_upgrade.result
mysql-test/r/mysqlcheck.result
mysql-test/r/mysqldump-max.result
mysql-test/r/mysqldump.result
mysql-test/r/mysqlshow.result
mysql-test/r/partition.result
mysql-test/r/partition_error.result
mysql-test/r/partition_innodb.result
mysql-test/r/partition_symlink.result
mysql-test/r/ps.result
mysql-test/r/ps_ddl.result
mysql-test/r/show_check.result
mysql-test/r/slow_launch_time_func.result
mysql-test/r/sp-error.result
mysql-test/r/sp.result
mysql-test/r/status.result
mysql-test/r/subselect.result
mysql-test/r/subselect3.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/r/symlink.result
mysql-test/r/system_mysql_db.result
mysql-test/r/trigger-trans.result
mysql-test/r/tx_isolation_func.result
mysql-test/r/type_bit.result
mysql-test/r/type_datetime.result
mysql-test/r/type_newdecimal.result
mysql-test/r/type_set.result
mysql-test/r/union.result
mysql-test/r/user_var.result
mysql-test/r/view_grant.result
mysql-test/std_data/Index.xml
mysql-test/suite/binlog/r/binlog_database.result
mysql-test/suite/binlog/r/binlog_multi_engine.result
mysql-test/suite/binlog/r/binlog_row_binlog.result
mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
mysql-test/suite/binlog/r/binlog_stm_binlog.result
mysql-test/suite/binlog/r/binlog_stm_blackhole.result
mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
mysql-test/suite/binlog/t/binlog_killed.test
mysql-test/suite/binlog/t/binlog_killed_simulate.test
mysql-test/suite/binlog/t/binlog_multi_engine.test
mysql-test/suite/binlog/t/binlog_start_comment.test
mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test
mysql-test/suite/falcon/r/falcon_bug_22154-big.result
mysql-test/suite/falcon/r/falcon_bug_22175.result
mysql-test/suite/falcon/r/falcon_bug_22972.result
mysql-test/suite/falcon/r/falcon_bug_34164.result
mysql-test/suite/falcon/r/falcon_bug_34890.result
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/r/rpl_bug_33688.result
mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
mysql-test/suite/falcon/t/disabled.def
mysql-test/suite/falcon/t/falcon_bug_22154-big.test
mysql-test/suite/falcon/t/falcon_bug_22175.test
mysql-test/suite/falcon/t/falcon_bug_22179.test
mysql-test/suite/falcon/t/falcon_bug_22845.test
mysql-test/suite/falcon/t/falcon_bug_22972.test
mysql-test/suite/falcon/t/falcon_bug_23818_I.test
mysql-test/suite/falcon/t/falcon_bug_24858.test
mysql-test/suite/falcon/t/falcon_bug_33081.test
mysql-test/suite/falcon/t/falcon_bug_34890.test
mysql-test/suite/falcon/t/falcon_bug_37080.test
mysql-test/suite/falcon/t/falcon_bugs2.test
mysql-test/suite/falcon/t/falcon_options.test
mysql-test/suite/falcon/t/falcon_options2.test
mysql-test/suite/falcon/t/rpl_bug_33688.test
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
mysql-test/suite/falcon_team/r/falcon_bug_36294.result
mysql-test/suite/falcon_team/t/disabled.def
mysql-test/suite/falcon_team/t/falcon_bug_36294.test
mysql-test/suite/funcs_1/datadict/processlist_priv.inc
mysql-test/suite/funcs_1/datadict/processlist_val.inc
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_columns_is_falcon.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_statistics_mysql.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
mysql-test/suite/funcs_1/r/is_tables.result
mysql-test/suite/funcs_1/r/is_tables_innodb.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
mysql-test/suite/funcs_1/r/is_tables_memory.result
mysql-test/suite/funcs_1/r/is_tables_myisam.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
mysql-test/suite/funcs_1/r/processlist_priv_ps.result
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
mysql-test/suite/funcs_1/r/processlist_val_ps.result
mysql-test/suite/funcs_1/views/func_view.inc
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
mysql-test/suite/jp/t/disabled.def
mysql-test/suite/ndb/r/ndb_dd_dump.result
mysql-test/suite/ndb/r/ndb_partition_key.result
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/ndb/t/ndb_alter_table_online.test
mysql-test/suite/ndb/t/ndb_dd_dump.test
mysql-test/suite/ndb/t/ndb_partition_key.test
mysql-test/suite/ndb/t/ndb_restore_print.test
mysql-test/suite/ndb_team/t/ndb_autodiscover.test
mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test
mysql-test/suite/parts/inc/partition_alter4.inc
mysql-test/suite/parts/inc/partition_key_32col.inc
mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
mysql-test/suite/parts/r/partition_alter1_1_2_ndb.result
mysql-test/suite/parts/r/partition_alter1_1_innodb.result
mysql-test/suite/parts/r/partition_alter1_1_myisam.result
mysql-test/suite/parts/r/partition_alter1_1_ndb.result
mysql-test/suite/parts/r/partition_alter1_2_innodb.result
mysql-test/suite/parts/r/partition_alter1_2_myisam.result
mysql-test/suite/parts/r/partition_alter1_2_ndb.result
mysql-test/suite/parts/r/partition_alter4_innodb.result
mysql-test/suite/parts/r/partition_alter4_myisam.result
mysql-test/suite/parts/r/partition_auto_increment_falcon.result
mysql-test/suite/parts/r/partition_basic_innodb.result
mysql-test/suite/parts/r/partition_basic_myisam.result
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
mysql-test/suite/parts/r/partition_engine_innodb.result
mysql-test/suite/parts/r/partition_engine_myisam.result
mysql-test/suite/parts/r/partition_special_innodb.result
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/parts/t/partition_special_innodb.test
mysql-test/suite/rpl/r/rpl_ddl.result
mysql-test/suite/rpl/r/rpl_failed_optimize.result
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
mysql-test/suite/rpl/r/rpl_row_create_table.result
mysql-test/suite/rpl/r/rpl_row_log.result
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
mysql-test/suite/rpl/r/rpl_sp.result
mysql-test/suite/rpl/r/rpl_stm_log.result
mysql-test/suite/rpl/r/rpl_temporary.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_row_create_table.test
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
mysql-test/suite/rpl/t/rpl_stm_log-slave.opt
mysql-test/suite/rpl/t/rpl_temporary.test
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_log.result
mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
mysql-test/t/auto_increment.test
mysql-test/t/compare.test
mysql-test/t/constraints.test
mysql-test/t/create.test
mysql-test/t/csv.test
mysql-test/t/ctype_big5.test
mysql-test/t/ctype_latin2_ch.test
mysql-test/t/ctype_ucs.test
mysql-test/t/ctype_utf8.test
mysql-test/t/default.test
mysql-test/t/disabled.def
mysql-test/t/distinct.test
mysql-test/t/drop-no_root.test
mysql-test/t/events_2.test
mysql-test/t/events_bugs.test
mysql-test/t/events_grant.test
mysql-test/t/federated.test
mysql-test/t/federated_bug_25714.test
mysql-test/t/func_group.test
mysql-test/t/func_regexp.test
mysql-test/t/grant2.test
mysql-test/t/group_min_max.test
mysql-test/t/information_schema_db.test
mysql-test/t/innodb-semi-consistent.test
mysql-test/t/innodb.test
mysql-test/t/join.test
mysql-test/t/loaddata.test
mysql-test/t/loadxml.test
mysql-test/t/lock_multi.test
mysql-test/t/log_basic.test
mysql-test/t/log_state.test
mysql-test/t/log_tables.test
mysql-test/t/lowercase_table3.test
mysql-test/t/maria.test
mysql-test/t/maria2.test
mysql-test/t/myisam.test
mysql-test/t/mysqlbinlog_base64.test
mysql-test/t/mysqldump-max.test
mysql-test/t/mysqldump.test
mysql-test/t/outfile.test
mysql-test/t/partition.test
mysql-test/t/partition_error.test
mysql-test/t/partition_innodb.test
mysql-test/t/partition_mgm_err2.test
mysql-test/t/partition_not_windows.test
mysql-test/t/partition_symlink.test
mysql-test/t/ps.test
mysql-test/t/ps_1general.test
mysql-test/t/ps_ddl.test
mysql-test/t/query_cache.test
mysql-test/t/rpl_slave_allow_batching_basic.test
mysql-test/t/rpl_slave_compressed_protocol_basic.test
mysql-test/t/rpl_slave_exec_mode_basic.test
mysql-test/t/show_check.test
mysql-test/t/slow_launch_time_func.test
mysql-test/t/sp-error.test
mysql-test/t/sp.test
mysql-test/t/status.test
mysql-test/t/subselect.test
mysql-test/t/subselect3.test
mysql-test/t/symlink.test
mysql-test/t/system_mysql_db_fix30020.test
mysql-test/t/system_mysql_db_fix40123.test
mysql-test/t/system_mysql_db_fix50030.test
mysql-test/t/system_mysql_db_fix50117.test
mysql-test/t/trigger-trans.test
mysql-test/t/tx_isolation_func.test
mysql-test/t/type_bit.test
mysql-test/t/type_datetime.test
mysql-test/t/type_newdecimal.test
mysql-test/t/type_set.test
mysql-test/t/union.test
mysql-test/t/user_var.test
mysql-test/t/view_grant.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/default_modify.c
mysys/hash.c
mysys/mf_pack.c
mysys/my_chsize.c
mysys/my_create.c
mysys/my_delete.c
mysys/my_dup.c
mysys/my_file.c
mysys/my_fopen.c
mysys/my_fstream.c
mysys/my_getncpus.c
mysys/my_lib.c
mysys/my_lock.c
mysys/my_mmap.c
mysys/my_open.c
mysys/my_pread.c
mysys/my_quick.c
mysys/my_read.c
mysys/my_seek.c
mysys/my_static.c
mysys/my_symlink.c
mysys/my_sync.c
mysys/my_write.c
mysys/mysys_priv.h
mysys/safemalloc.c
mysys/stacktrace.c
netware/BUILD/compile-linux-tools
netware/BUILD/nwbootstrap
netware/Makefile.am
netware/mysql_install_db.c
scripts/make_binary_distribution.sh
scripts/make_win_bin_dist
scripts/mysql_install_db.sh
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_data.sql
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/CMakeLists.txt
sql/backup/Makefile.am
sql/backup/backup_aux.h
sql/backup/backup_info.cc
sql/backup/backup_info.h
sql/backup/backup_kernel.h
sql/backup/backup_test.cc
sql/backup/be_default.cc
sql/backup/be_snapshot.cc
sql/backup/data_backup.cc
sql/backup/image_info.cc
sql/backup/image_info.h
sql/backup/kernel.cc
sql/backup/logger.cc
sql/backup/logger.h
sql/backup/stream.cc
sql/backup/stream.h
sql/backup/stream_v1.c
sql/backup/stream_v1.h
sql/backup/stream_v1_transport.c
sql/ddl_blocker.cc
sql/debug_sync.cc
sql/discover.cc
sql/event_db_repository.cc
sql/event_parse_data.cc
sql/event_parse_data.h
sql/events.cc
sql/field.cc
sql/field.h
sql/ha_ndbcluster.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/hostname.cc
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_func.cc
sql/item_func.h
sql/key.cc
sql/lock.cc
sql/log.cc
sql/log.h
sql/log_event.cc
sql/log_event.h
sql/log_event_old.cc
sql/log_event_old.h
sql/mdl.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/parse_file.cc
sql/parse_file.h
sql/partition_info.h
sql/procedure.h
sql/protocol.cc
sql/protocol.h
sql/records.cc
sql/repl_failsafe.cc
sql/rpl_injector.cc
sql/rpl_injector.h
sql/rpl_record.cc
sql/rpl_record.h
sql/rpl_rli.cc
sql/rpl_tblmap.cc
sql/rpl_tblmap.h
sql/rpl_utility.h
sql/scheduler.cc
sql/set_var.cc
sql/set_var.h
sql/share/errmsg.txt
sql/si_objects.cc
sql/si_objects.h
sql/slave.cc
sql/sp_head.cc
sql/sp_rcontext.cc
sql/sp_rcontext.h
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_cache.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_cursor.cc
sql/sql_db.cc
sql/sql_derived.cc
sql/sql_do.cc
sql/sql_error.cc
sql/sql_handler.cc
sql/sql_help.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_prepare.cc
sql/sql_profile.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_show.h
sql/sql_table.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/structs.h
sql/table.cc
sql/table.h
storage/archive/ha_archive.cc
storage/blackhole/ha_blackhole.cc
storage/blackhole/ha_blackhole.h
storage/csv/ha_tina.cc
storage/falcon/BDB.cpp
storage/falcon/BDB.h
storage/falcon/BackLog.cpp
storage/falcon/CMakeLists.txt
storage/falcon/Cache.cpp
storage/falcon/Configuration.cpp
storage/falcon/DataPage.h
storage/falcon/Database.cpp
storage/falcon/Database.h
storage/falcon/Dbb.cpp
storage/falcon/DeferredIndex.cpp
storage/falcon/DeferredIndexWalker.cpp
storage/falcon/Error.cpp
storage/falcon/IO.cpp
storage/falcon/IOx.h
storage/falcon/Index.cpp
storage/falcon/Index2RootPage.cpp
storage/falcon/IndexRootPage.cpp
storage/falcon/InfoTable.cpp
storage/falcon/InfoTable.h
storage/falcon/Interlock.h
storage/falcon/Makefile.am
storage/falcon/MemMgr.cpp
storage/falcon/MemMgr.h
storage/falcon/MemoryManager.h
storage/falcon/RecordVersion.cpp
storage/falcon/RecoveryObjects.cpp
storage/falcon/RepositoryVolume.cpp
storage/falcon/SQLException.h
storage/falcon/SRLUpdateIndex.cpp
storage/falcon/SRLUpdateRecords.cpp
storage/falcon/Section.h
storage/falcon/SerialLog.cpp
storage/falcon/SerialLog.h
storage/falcon/SerialLogFile.cpp
storage/falcon/SerialLogFile.h
storage/falcon/SerialLogWindow.cpp
storage/falcon/Statement.cpp
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageDatabase.h
storage/falcon/StorageHandler.cpp
storage/falcon/StorageHandler.h
storage/falcon/StorageParameters.h
storage/falcon/StorageTable.cpp
storage/falcon/StorageTable.h
storage/falcon/StorageTableShare.cpp
storage/falcon/StorageTableShare.h
storage/falcon/StorageVersion.h
storage/falcon/SyncObject.cpp
storage/falcon/SyncObject.h
storage/falcon/Table.cpp
storage/falcon/Table.h
storage/falcon/TableSpace.cpp
storage/falcon/TableSpaceManager.cpp
storage/falcon/TableSpaceManager.h
storage/falcon/Transaction.cpp
storage/falcon/Transaction.h
storage/falcon/TransactionManager.cpp
storage/falcon/TransactionManager.h
storage/falcon/ha_falcon.cpp
storage/falcon/ha_falcon.h
storage/falcon/plug.in
storage/federated/ha_federated.cc
storage/federated/ha_federated.h
storage/innobase/ha/ha0ha.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/lock/lock0lock.c
storage/maria/CMakeLists.txt
storage/maria/ha_maria.cc
storage/maria/ma_blockrec.c
storage/maria/ma_check.c
storage/maria/ma_checkpoint.c
storage/maria/ma_close.c
storage/maria/ma_create.c
storage/maria/ma_dbug.c
storage/maria/ma_delete.c
storage/maria/ma_extra.c
storage/maria/ma_info.c
storage/maria/ma_keycache.c
storage/maria/ma_locking.c
storage/maria/ma_loghandler.c
storage/maria/ma_open.c
storage/maria/ma_pagecache.c
storage/maria/ma_recovery.c
storage/maria/ma_search.c
storage/maria/ma_state.c
storage/maria/ma_state.h
storage/maria/ma_update.c
storage/maria/ma_write.c
storage/maria/maria_def.h
storage/maria/maria_ftdump.c
storage/maria/maria_pack.c
storage/myisam/mi_check.c
storage/myisam/mi_create.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_examine_log.c
storage/myisam/mi_locking.c
storage/myisam/mi_open.c
storage/myisam/mi_search.c
storage/myisam/mi_static.c
storage/myisam/myisam_backup_engine.cc
storage/myisam/myisam_ftdump.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
strings/ctype-czech.c
strings/ctype-simple.c
strings/ctype-sjis.c
strings/decimal.c
support-files/my-huge.cnf.sh
support-files/my-innodb-heavy-4G.cnf.sh
support-files/my-large.cnf.sh
support-files/my-medium.cnf.sh
support-files/my-small.cnf.sh
support-files/mysql.spec.sh
tests/mysql_client_test.c
vio/viosocket.c
win/README
win/create_manifest.js
zlib/gzio.c
mysql-test/suite/backup/r/backup.result
mysql-test/suite/backup/r/backup_ddl_blocker.result
mysql-test/suite/backup/r/backup_errors.result
mysql-test/suite/backup/r/backup_no_be.result
mysql-test/suite/backup/r/backup_logs.result
mysql-test/suite/backup/r/backup_security.result
mysql-test/suite/backup/r/backup_tablespace.result
mysql-test/suite/backup/r/backup_views.result
mysql-test/suite/falcon/r/falcon_bug_22165.result
mysql-test/suite/falcon/r/falcon_bug_22173a.result
mysql-test/suite/falcon/r/falcon_bug_22189.result
mysql-test/suite/falcon/r/falcon_bug_22207.result
mysql-test/suite/falcon/r/falcon_bug_23189.result
mysql-test/suite/falcon/r/falcon_bug_23945.result
mysql-test/suite/falcon/r/falcon_bug_24024.result
mysql-test/suite/falcon/r/falcon_bug_30480_A.result
mysql-test/suite/falcon/r/falcon_bug_30480_B.result
mysql-test/suite/falcon/r/falcon_bug_30826.result
mysql-test/suite/falcon/r/falcon_bug_34351_C.result
mysql-test/suite/falcon/r/ps_8falcon.result
mysql-test/suite/falcon/t/falcon_bug_22165.test
mysql-test/suite/falcon/t/falcon_bug_22173a.test
mysql-test/suite/falcon/t/falcon_bug_22189.test
mysql-test/suite/falcon/t/falcon_bug_22207.test
mysql-test/suite/falcon/t/falcon_bug_23189.test
mysql-test/suite/falcon/t/falcon_bug_23945.test
mysql-test/suite/falcon/t/falcon_bug_24024.test
mysql-test/suite/falcon/t/falcon_bug_30480_A.test
mysql-test/suite/falcon/t/falcon_bug_30480_B.test
mysql-test/suite/falcon/t/falcon_bug_30826.test
mysql-test/suite/falcon/t/falcon_bug_34351_C.test
mysql-test/suite/falcon/t/falcon_bug_34892.test
mysql-test/suite/falcon/t/ps_8falcon.test
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/t/storedproc.test
mysql-test/suite/parts/inc/partition_alter2_1.inc
mysql-test/suite/parts/r/partition_alter2_1_innodb.result
mysql-test/suite/parts/r/partition_alter2_1_myisam.result
mysql-test/suite/parts/t/partition_alter2_1_innodb.test
mysql-test/suite/parts/t/partition_alter2_1_myisam.test
mysql-test/suite/rpl_ndb_big/r/rpl_truncate_7ndb_2.result
mysql-test/suite/rpl_ndb_big/t/rpl_truncate_7ndb_2.test
mysql-test/suite/backup/t/backup.test
mysql-test/suite/backup/t/backup_errors.test
mysql-test/suite/backup/t/backup_no_be.test
mysql-test/suite/backup/t/backup_no_data.test
mysql-test/suite/backup/t/backup_logs.test
mysql-test/suite/backup/t/backup_views.test
=== modified file 'sql/records.h'
--- a/sql/records.h 2008-09-12 09:09:27 +0000
+++ b/sql/records.h 2008-10-16 00:20:10 +0000
@@ -25,6 +25,7 @@ class handler;
struct TABLE;
class THD;
class SQL_SELECT;
+class Copy_field;
/**
A context for reading through a single table using a chosen access method:
@@ -62,6 +63,13 @@ struct READ_RECORD
bool print_error, ignore_not_found_rows;
struct st_join_table *do_insideout_scan;
+ /*
+ SJ-Materialization runtime may need to read fields from the materialized
+ table and unpack them into original table fields:
+ */
+ Copy_field *copy_field;
+ Copy_field *copy_field_end;
+
public:
READ_RECORD() {}
};
=== modified file 'sql/structs.h'
--- a/sql/structs.h 2008-10-15 23:14:03 +0000
+++ b/sql/structs.h 2008-10-16 00:20:10 +0000
@@ -118,13 +118,6 @@ typedef struct st_reginfo { /* Extra in
class Copy_field;
- /*
- SJ-Materialization runtime may need to read fields from the materialized
- table and unpack them into original table fields:
- */
- Copy_field *copy_field;
- Copy_field *copy_field_end;
-
/*
Originally MySQL used MYSQL_TIME structure inside server only, but since
4.1 it's exported to user in the new client API. Define aliases for
| Thread |
|---|
| • bzr push into mysql-6.0-opt-subqueries branch (sergefp:2701 to 2702) | Sergey Petrunia | 18 Oct |
