2675 Daniel Fischer 2008-07-08
this can't work
modified:
storage/falcon/Makefile.am
2674 Daniel Fischer 2008-07-08 [merge]
merge
modified:
mysql-test/suite/funcs_1/datadict/charset_collation.inc
mysql-test/suite/funcs_1/t/charset_collation_1.test
mysql-test/suite/funcs_1/t/charset_collation_3.test
mysql-test/suite/funcs_1/t/disabled.def
2673 Joerg Bruehe 2008-07-03 [merge]
Merge from main 6.0 (mostly Falcon changes) into 6.0-build.
removed:
dbug/.cvsignore
dbug/doinstall.sh
dbug/install.sh
dbug/mklintlib.sh
dbug/qmake.cmd
dbug/vargs.h
include/atomic/generic-msvc.h
include/lf.h
mysql-test/suite/falcon/r/falcon_bug_22182.result
mysql-test/suite/falcon/r/falcon_bug_26058.result
mysql-test/suite/falcon/r/falcon_bug_32413.result
mysql-test/suite/falcon/r/falcon_ts.result
mysql-test/suite/falcon/t/falcon_bug_22182.test
mysql-test/suite/falcon/t/falcon_bug_26058.test
mysql-test/suite/falcon/t/falcon_bug_32413.test
mysql-test/suite/falcon/t/falcon_ts.test
mysys/lf_alloc-pin.c
mysys/lf_dynarray.c
mysys/lf_hash.c
added:
BUILD/compile-amd64-gprof-no-ndb
dbug/remove_function_from_trace.pl
dbug/tests-t.pl
dbug/tests.c
include/atomic/generic-msvc.h
include/lf.h
include/maria.h
include/myisamchk.h
include/wqueue.h
mysql-test/extra/binlog_tests/implicit.test
mysql-test/include/have_maria.inc
mysql-test/include/maria_empty_logs.inc
mysql-test/include/maria_make_snapshot.inc
mysql-test/include/maria_make_snapshot_for_comparison.inc
mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
mysql-test/include/maria_verify_recovery.inc
mysql-test/r/maria-big.result
mysql-test/r/maria-connect.result
mysql-test/r/maria-gis-rtree-dynamic.result
mysql-test/r/maria-gis-rtree-trans.result
mysql-test/r/maria-gis-rtree.result
mysql-test/r/maria-mvcc.result
mysql-test/r/maria-no-logging.result
mysql-test/r/maria-page-checksum.result
mysql-test/r/maria-preload.result
mysql-test/r/maria-purge.result
mysql-test/r/maria-recover.result
mysql-test/r/maria-recovery-big.result
mysql-test/r/maria-recovery-bitmap.result
mysql-test/r/maria-recovery-rtree-ft.result
mysql-test/r/maria-recovery.result
mysql-test/r/maria-recovery2.result
mysql-test/r/maria.result
mysql-test/r/maria2.result
mysql-test/r/maria3.result
mysql-test/r/maria_notembedded.result
mysql-test/r/old-mode.result
mysql-test/r/ps_maria.result
mysql-test/r/row-checksum-old.result
mysql-test/r/row-checksum.result
mysql-test/suite/binlog/r/binlog_implicit_commit.result
mysql-test/suite/binlog/t/binlog_implicit_commit.test
mysql-test/suite/falcon/r/falcon_bug_31110.result
mysql-test/suite/falcon/r/falcon_bug_31114.result
mysql-test/suite/falcon/r/falcon_bug_31295.result
mysql-test/suite/falcon/r/falcon_bug_31311.result
mysql-test/suite/falcon/r/falcon_bug_32398.result
mysql-test/suite/falcon/r/falcon_bug_33212.result
mysql-test/suite/falcon/r/falcon_bug_33213.result
mysql-test/suite/falcon/r/falcon_bug_33397.result
mysql-test/suite/falcon/r/falcon_bug_33404.result
mysql-test/suite/falcon/r/falcon_bug_33723.result
mysql-test/suite/falcon/r/falcon_bug_34048.result
mysql-test/suite/falcon/r/falcon_bug_34617.result
mysql-test/suite/falcon/r/falcon_bug_37080.result
mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
mysql-test/suite/falcon/t/falcon_bug_31110.test
mysql-test/suite/falcon/t/falcon_bug_31114.test
mysql-test/suite/falcon/t/falcon_bug_31295.test
mysql-test/suite/falcon/t/falcon_bug_31311.test
mysql-test/suite/falcon/t/falcon_bug_32398.test
mysql-test/suite/falcon/t/falcon_bug_33212.test
mysql-test/suite/falcon/t/falcon_bug_33213.test
mysql-test/suite/falcon/t/falcon_bug_33397.test
mysql-test/suite/falcon/t/falcon_bug_33404.test
mysql-test/suite/falcon/t/falcon_bug_33723.test
mysql-test/suite/falcon/t/falcon_bug_34048.test
mysql-test/suite/falcon/t/falcon_bug_34617.test
mysql-test/suite/falcon/t/falcon_bug_37080.test
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
mysql-test/suite/falcon_team/
mysql-test/suite/falcon_team/r/
mysql-test/suite/falcon_team/r/falcon_bug_31296.result
mysql-test/suite/falcon_team/r/falcon_bug_36294.result
mysql-test/suite/falcon_team/t/
mysql-test/suite/falcon_team/t/disabled.def
mysql-test/suite/falcon_team/t/falcon_bug_31296.test
mysql-test/suite/falcon_team/t/falcon_bug_36294.test
mysql-test/suite/rpl/r/rpl_stm_maria.result
mysql-test/suite/rpl/t/rpl_stm_maria.test
mysql-test/t/maria-big.test
mysql-test/t/maria-connect.test
mysql-test/t/maria-gis-rtree-dynamic.test
mysql-test/t/maria-gis-rtree-trans.test
mysql-test/t/maria-gis-rtree.test
mysql-test/t/maria-mvcc.test
mysql-test/t/maria-no-logging.test
mysql-test/t/maria-page-checksum.test
mysql-test/t/maria-preload.test
mysql-test/t/maria-purge.test
mysql-test/t/maria-recover-master.opt
mysql-test/t/maria-recover.test
mysql-test/t/maria-recovery-big-master.opt
mysql-test/t/maria-recovery-big.test
mysql-test/t/maria-recovery-bitmap-master.opt
mysql-test/t/maria-recovery-bitmap.test
mysql-test/t/maria-recovery-master.opt
mysql-test/t/maria-recovery-rtree-ft-master.opt
mysql-test/t/maria-recovery-rtree-ft.test
mysql-test/t/maria-recovery.test
mysql-test/t/maria-recovery2-master.opt
mysql-test/t/maria-recovery2.test
mysql-test/t/maria.test
mysql-test/t/maria2.test
mysql-test/t/maria3.test
mysql-test/t/maria_notembedded.test
mysql-test/t/old-mode-master.opt
mysql-test/t/old-mode.test
mysql-test/t/ps_maria.test
mysql-test/t/row-checksum-old-master.opt
mysql-test/t/row-checksum-old.test
mysql-test/t/row-checksum.test
mysql-test/t/sync_frm_basic-master.opt
mysys/lf_alloc-pin.c
mysys/lf_dynarray.c
mysys/lf_hash.c
mysys/my_chmod.c
mysys/my_rnd.c
mysys/my_safehash.c
mysys/my_safehash.h
mysys/my_uuid.c
mysys/wqueue.c
sql-bench/myisam.cnf
storage/falcon/Backup.cpp
storage/falcon/Backup.h
storage/falcon/IndexWalker.cpp
storage/falcon/IndexWalker.h
storage/falcon/SectorBuffer.cpp
storage/falcon/SectorBuffer.h
storage/falcon/SectorCache.cpp
storage/falcon/SectorCache.h
storage/falcon/WalkDeferred.cpp
storage/falcon/WalkDeferred.h
storage/falcon/WalkIndex.cpp
storage/falcon/WalkIndex.h
storage/maria/
storage/maria/CMakeLists.txt
storage/maria/KNOWN_BUGS.txt
storage/maria/Makefile.am
storage/maria/file_formats.txt
storage/maria/ft_maria.c
storage/maria/ha_maria.cc
storage/maria/ha_maria.h
storage/maria/lockman.c
storage/maria/lockman.h
storage/maria/ma_bitmap.c
storage/maria/ma_blockrec.c
storage/maria/ma_blockrec.h
storage/maria/ma_cache.c
storage/maria/ma_changed.c
storage/maria/ma_check.c
storage/maria/ma_check_standalone.h
storage/maria/ma_checkpoint.c
storage/maria/ma_checkpoint.h
storage/maria/ma_checksum.c
storage/maria/ma_close.c
storage/maria/ma_commit.c
storage/maria/ma_commit.h
storage/maria/ma_control_file.c
storage/maria/ma_control_file.h
storage/maria/ma_create.c
storage/maria/ma_dbug.c
storage/maria/ma_delete.c
storage/maria/ma_delete_all.c
storage/maria/ma_delete_table.c
storage/maria/ma_dynrec.c
storage/maria/ma_extra.c
storage/maria/ma_ft_boolean_search.c
storage/maria/ma_ft_eval.c
storage/maria/ma_ft_eval.h
storage/maria/ma_ft_nlq_search.c
storage/maria/ma_ft_parser.c
storage/maria/ma_ft_stem.c
storage/maria/ma_ft_test1.c
storage/maria/ma_ft_test1.h
storage/maria/ma_ft_update.c
storage/maria/ma_ftdefs.h
storage/maria/ma_fulltext.h
storage/maria/ma_info.c
storage/maria/ma_init.c
storage/maria/ma_key.c
storage/maria/ma_key_recover.c
storage/maria/ma_key_recover.h
storage/maria/ma_keycache.c
storage/maria/ma_locking.c
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.h
storage/maria/ma_loghandler_lsn.h
storage/maria/ma_open.c
storage/maria/ma_packrec.c
storage/maria/ma_page.c
storage/maria/ma_pagecache.c
storage/maria/ma_pagecache.h
storage/maria/ma_pagecaches.c
storage/maria/ma_pagecrc.c
storage/maria/ma_panic.c
storage/maria/ma_preload.c
storage/maria/ma_range.c
storage/maria/ma_recovery.c
storage/maria/ma_recovery.h
storage/maria/ma_recovery_util.c
storage/maria/ma_recovery_util.h
storage/maria/ma_rename.c
storage/maria/ma_rfirst.c
storage/maria/ma_rkey.c
storage/maria/ma_rlast.c
storage/maria/ma_rnext.c
storage/maria/ma_rnext_same.c
storage/maria/ma_rprev.c
storage/maria/ma_rrnd.c
storage/maria/ma_rsame.c
storage/maria/ma_rsamepos.c
storage/maria/ma_rt_index.c
storage/maria/ma_rt_index.h
storage/maria/ma_rt_key.c
storage/maria/ma_rt_key.h
storage/maria/ma_rt_mbr.c
storage/maria/ma_rt_mbr.h
storage/maria/ma_rt_split.c
storage/maria/ma_rt_test.c
storage/maria/ma_scan.c
storage/maria/ma_search.c
storage/maria/ma_sort.c
storage/maria/ma_sp_defs.h
storage/maria/ma_sp_key.c
storage/maria/ma_sp_test.c
storage/maria/ma_state.c
storage/maria/ma_state.h
storage/maria/ma_static.c
storage/maria/ma_statrec.c
storage/maria/ma_test1.c
storage/maria/ma_test2.c
storage/maria/ma_test3.c
storage/maria/ma_test_all.res
storage/maria/ma_test_all.sh
storage/maria/ma_test_big.sh
storage/maria/ma_test_force_start.pl
storage/maria/ma_test_recovery
storage/maria/ma_unique.c
storage/maria/ma_update.c
storage/maria/ma_write.c
storage/maria/maria_chk.c
storage/maria/maria_def.h
storage/maria/maria_ftdump.c
storage/maria/maria_pack.c
storage/maria/maria_read_log.c
storage/maria/maria_rename.sh
storage/maria/plug.in
storage/maria/tablockman.c
storage/maria/tablockman.h
storage/maria/test_pack
storage/maria/trnman.c
storage/maria/trnman.h
storage/maria/trnman_public.h
storage/maria/unittest/
storage/maria/unittest/CMakeLists.txt
storage/maria/unittest/Makefile.am
storage/maria/unittest/lockman-t.c
storage/maria/unittest/lockman1-t.c
storage/maria/unittest/lockman2-t.c
storage/maria/unittest/ma_control_file-t.c
storage/maria/unittest/ma_loghandler_examples.c
storage/maria/unittest/ma_maria_log_cleanup.c
storage/maria/unittest/ma_pagecache_consist.c
storage/maria/unittest/ma_pagecache_rwconsist.c
storage/maria/unittest/ma_pagecache_single.c
storage/maria/unittest/ma_test_all-t
storage/maria/unittest/ma_test_loghandler-t.c
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
storage/maria/unittest/ma_test_loghandler_multigroup-t.c
storage/maria/unittest/ma_test_loghandler_multithread-t.c
storage/maria/unittest/ma_test_loghandler_noflush-t.c
storage/maria/unittest/ma_test_loghandler_nologs-t.c
storage/maria/unittest/ma_test_loghandler_pagecache-t.c
storage/maria/unittest/ma_test_loghandler_purge-t.c
storage/maria/unittest/ma_test_recovery.expected
storage/maria/unittest/ma_test_recovery.pl
storage/maria/unittest/sequence_storage.c
storage/maria/unittest/sequence_storage.h
storage/maria/unittest/test_file.c
storage/maria/unittest/test_file.h
storage/maria/unittest/trnman-t.c
storage/myisam/ft_myisam.c
storage/myisammrg/scripts/
storage/myisammrg/scripts/mysql_config.pl
vio/CMakeFiles/
renamed:
mysql-test/suite/falcon/r/falcon_bug_22165.result => mysql-test/suite/falcon_team/r/falcon_bug_22165.result
mysql-test/suite/falcon/r/falcon_bug_22166.result => mysql-test/suite/falcon_team/r/falcon_bug_22166.result
mysql-test/suite/falcon/r/falcon_bug_22169.result => mysql-test/suite/falcon/r/falcon_bug_22169-big.result
mysql-test/suite/falcon/r/falcon_bug_22173.result => mysql-test/suite/falcon_team/r/falcon_bug_22173.result
mysql-test/suite/falcon/r/falcon_bug_22173a.result => mysql-test/suite/falcon_team/r/falcon_bug_22173a.result
mysql-test/suite/falcon/r/falcon_bug_22187.result => mysql-test/suite/falcon_team/r/falcon_bug_22187.result
mysql-test/suite/falcon/r/falcon_bug_22189.result => mysql-test/suite/falcon_team/r/falcon_bug_22189.result
mysql-test/suite/falcon/r/falcon_bug_22207.result => mysql-test/suite/falcon_team/r/falcon_bug_22207.result
mysql-test/suite/falcon/r/falcon_bug_23189.result => mysql-test/suite/falcon_team/r/falcon_bug_23189.result
mysql-test/suite/falcon/r/falcon_bug_23692.result => mysql-test/suite/falcon_team/r/falcon_bug_23692.result
mysql-test/suite/falcon/r/falcon_bug_23945.result => mysql-test/suite/falcon_team/r/falcon_bug_23945.result
mysql-test/suite/falcon/r/falcon_bug_23962.result => mysql-test/suite/falcon_team/r/falcon_bug_23962.result
mysql-test/suite/falcon/r/falcon_bug_24024.result => mysql-test/suite/falcon_team/r/falcon_bug_24024.result
mysql-test/suite/falcon/r/falcon_bug_26433.result => mysql-test/suite/falcon_team/r/falcon_bug_26433.result
mysql-test/suite/falcon/r/falcon_bug_27997.result => mysql-test/suite/falcon_team/r/falcon_bug_27997.result
mysql-test/suite/falcon/r/falcon_bug_28006.result => mysql-test/suite/falcon_team/r/falcon_bug_28006.result
mysql-test/suite/falcon/r/falcon_bug_29246.result => mysql-test/suite/falcon_team/r/falcon_bug_29246.result
mysql-test/suite/falcon/r/falcon_bug_30282.result => mysql-test/suite/falcon_team/r/falcon_bug_30282.result
mysql-test/suite/falcon/r/falcon_bug_30480_A.result => mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result
mysql-test/suite/falcon/r/falcon_bug_30480_B.result => mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result
mysql-test/suite/falcon/r/falcon_bug_30826.result => mysql-test/suite/falcon_team/r/falcon_bug_30826.result
mysql-test/suite/falcon/r/falcon_bug_34174.result => mysql-test/suite/falcon_team/r/falcon_bug_34174.result
mysql-test/suite/falcon/r/falcon_bug_34351_B.result => mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result
mysql-test/suite/falcon/r/falcon_bug_34351_C.result => mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result
mysql-test/suite/falcon/r/falcon_bug_34892.result => mysql-test/suite/falcon_team/r/falcon_bug_34892.result
mysql-test/suite/falcon/r/falcon_deadlock.result => mysql-test/suite/falcon_team/r/falcon_deadlock.result
mysql-test/suite/falcon/r/falcon_read-committed.result => mysql-test/suite/falcon_team/r/falcon_read-committed.result
mysql-test/suite/falcon/r/ps_8falcon.result => mysql-test/suite/falcon_team/r/ps_8falcon.result
mysql-test/suite/falcon/r/read_many_rows_falcon.result => mysql-test/suite/falcon_team/r/read_many_rows_falcon.result
mysql-test/suite/falcon/t/falcon_bug_22165.test => mysql-test/suite/falcon_team/t/falcon_bug_22165.test
mysql-test/suite/falcon/t/falcon_bug_22166.test => mysql-test/suite/falcon_team/t/falcon_bug_22166.test
mysql-test/suite/falcon/t/falcon_bug_22169.test => mysql-test/suite/falcon/t/falcon_bug_22169-big.test
mysql-test/suite/falcon/t/falcon_bug_22173.test => mysql-test/suite/falcon_team/t/falcon_bug_22173.test
mysql-test/suite/falcon/t/falcon_bug_22173a.test => mysql-test/suite/falcon_team/t/falcon_bug_22173a.test
mysql-test/suite/falcon/t/falcon_bug_22187.test => mysql-test/suite/falcon_team/t/falcon_bug_22187.test
mysql-test/suite/falcon/t/falcon_bug_22189.test => mysql-test/suite/falcon_team/t/falcon_bug_22189.test
mysql-test/suite/falcon/t/falcon_bug_22207.test => mysql-test/suite/falcon_team/t/falcon_bug_22207.test
mysql-test/suite/falcon/t/falcon_bug_23189.test => mysql-test/suite/falcon_team/t/falcon_bug_23189.test
mysql-test/suite/falcon/t/falcon_bug_23692.test => mysql-test/suite/falcon_team/t/falcon_bug_23692.test
mysql-test/suite/falcon/t/falcon_bug_23945.test => mysql-test/suite/falcon_team/t/falcon_bug_23945.test
mysql-test/suite/falcon/t/falcon_bug_23962.test => mysql-test/suite/falcon_team/t/falcon_bug_23962.test
mysql-test/suite/falcon/t/falcon_bug_24024.test => mysql-test/suite/falcon_team/t/falcon_bug_24024.test
mysql-test/suite/falcon/t/falcon_bug_26433.test => mysql-test/suite/falcon_team/t/falcon_bug_26433.test
mysql-test/suite/falcon/t/falcon_bug_27997.test => mysql-test/suite/falcon_team/t/falcon_bug_27997.test
mysql-test/suite/falcon/t/falcon_bug_28006.test => mysql-test/suite/falcon_team/t/falcon_bug_28006.test
mysql-test/suite/falcon/t/falcon_bug_29246.test => mysql-test/suite/falcon_team/t/falcon_bug_29246.test
mysql-test/suite/falcon/t/falcon_bug_30282.test => mysql-test/suite/falcon_team/t/falcon_bug_30282.test
mysql-test/suite/falcon/t/falcon_bug_30480_A.test => mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test
mysql-test/suite/falcon/t/falcon_bug_30480_B.test => mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test
mysql-test/suite/falcon/t/falcon_bug_30826.test => mysql-test/suite/falcon_team/t/falcon_bug_30826.test
mysql-test/suite/falcon/t/falcon_bug_34174.test => mysql-test/suite/falcon_team/t/falcon_bug_34174.test
mysql-test/suite/falcon/t/falcon_bug_34351_B.test => mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test
mysql-test/suite/falcon/t/falcon_bug_34351_C.test => mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test
mysql-test/suite/falcon/t/falcon_bug_34892.test => mysql-test/suite/falcon_team/t/falcon_bug_34892.test
mysql-test/suite/falcon/t/falcon_deadlock.test => mysql-test/suite/falcon_team/t/falcon_deadlock.test
mysql-test/suite/falcon/t/falcon_read-committed.test => mysql-test/suite/falcon_team/t/falcon_read-committed.test
mysql-test/suite/falcon/t/ps_8falcon.test => mysql-test/suite/falcon_team/t/ps_8falcon.test
mysql-test/suite/falcon/t/read_many_rows_falcon.test => mysql-test/suite/falcon_team/t/read_many_rows_falcon.test
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result => mysql-test/suite/funcs_1/r/is_collation_charset_applic.result
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test => mysql-test/suite/funcs_1/t/is_collation_charset_applic.test
mysql-test/suite/large_tests/r/falcon_bug_22150-big.result => mysql-test/suite/falcon/r/falcon_bug_22150-big.result
mysql-test/suite/large_tests/r/falcon_bug_22154.result => mysql-test/suite/falcon/r/falcon_bug_22154-big.result
mysql-test/suite/large_tests/r/falcon_record_cache_memory_leak-big.result => mysql-test/suite/falcon/r/falcon_record_cache_memory_leak-big.result
mysql-test/suite/large_tests/r/falcon_record_cache_memory_leak2-big.result => mysql-test/suite/falcon/r/falcon_record_cache_memory_leak2-big.result
mysql-test/suite/large_tests/t/falcon_bug_22150-big.test => mysql-test/suite/falcon/t/falcon_bug_22150-big.test
mysql-test/suite/large_tests/t/falcon_bug_22154.test => mysql-test/suite/falcon/t/falcon_bug_22154-big.test
mysql-test/suite/large_tests/t/falcon_record_cache_memory_leak-big.test => mysql-test/suite/falcon/t/falcon_record_cache_memory_leak-big.test
mysql-test/suite/large_tests/t/falcon_record_cache_memory_leak2-big.test => mysql-test/suite/falcon/t/falcon_record_cache_memory_leak2-big.test
mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result => mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
modified:
.bzr-mysql/default.conf
.bzrignore
BUILD/SETUP.sh
BUILD/compile-dist
BitKeeper/triggers/post-commit
BitKeeper/triggers/pre-delta
CMakeLists.txt
Makefile.am
client/get_password.c
client/mysqladmin.cc
client/mysqltest.c
cmd-line-utils/readline/bind.c
cmd-line-utils/readline/chardefs.h
cmd-line-utils/readline/display.c
cmd-line-utils/readline/histexpand.c
cmd-line-utils/readline/history.c
cmd-line-utils/readline/readline.c
cmd-line-utils/readline/text.c
config/ac-macros/plugins.m4
configure.in
dbug/CMakeLists.txt*
dbug/Makefile.am
dbug/dbug.c
dbug/dbug_add_tags.pl
dbug/user.r
extra/Makefile.am
extra/replace.c
include/Makefile.am
include/atomic/gcc_builtins.h
include/atomic/rwlock.h
include/config-win.h
include/ft_global.h
include/keycache.h
include/m_string.h
include/my_alloc.h
include/my_atomic.h
include/my_base.h
include/my_dbug.h
include/my_global.h
include/my_handler.h
include/my_pthread.h
include/my_sys.h
include/my_tree.h
include/myisam.h
include/myisampack.h
include/mysql/plugin.h
include/mysql_com.h
include/mysys_err.h
include/thr_lock.h
libmysql/CMakeLists.txt
libmysql/Makefile.shared
libmysql/libmysql.c
libmysqld/CMakeLists.txt
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
mysql-test/extra/rpl_tests/rpl_insert_delayed.test
mysql-test/include/ps_conv.inc
mysql-test/include/varchar.inc
mysql-test/include/wait_until_connected_again.inc
mysql-test/install_test_db.sh
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_report.pl
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/change_user.result
mysql-test/r/create.result
mysql-test/r/information_schema_parameters.result
mysql-test/r/information_schema_routines.result
mysql-test/r/innodb.result
mysql-test/r/merge.result
mysql-test/r/mix2_myisam.result
mysql-test/r/myisam.result
mysql-test/r/mysqldump.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/query_cache.result
mysql-test/r/subselect.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/variables-big.result
mysql-test/suite/falcon/r/falcon_bug_22183.result
mysql-test/suite/falcon/r/falcon_bug_22972.result
mysql-test/suite/falcon/r/falcon_bug_26828.result
mysql-test/suite/falcon/r/falcon_bug_29511.result
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/r/falcon_select.result
mysql-test/suite/falcon/t/disabled.def
mysql-test/suite/falcon/t/falcon_bug.template
mysql-test/suite/falcon/t/falcon_bug_22183.test
mysql-test/suite/falcon/t/falcon_bug_26828.test
mysql-test/suite/falcon/t/falcon_bug_29511.test
mysql-test/suite/falcon/t/falcon_bug_30031.test
mysql-test/suite/falcon/t/falcon_options.test
mysql-test/suite/falcon/t/falcon_select.test
mysql-test/suite/funcs_1/datadict/is_routines.inc
mysql-test/suite/funcs_1/datadict/is_triggers.inc
mysql-test/suite/funcs_1/datadict/is_views.inc
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.result
mysql-test/suite/funcs_1/r/is_events.result
mysql-test/suite/funcs_1/r/is_routines.result
mysql-test/suite/funcs_1/r/is_tables_is.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/is_triggers.result
mysql-test/suite/funcs_1/r/is_views.result
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
mysql-test/suite/funcs_1/t/is_columns.test
mysql-test/suite/funcs_1/t/is_events.test
mysql-test/suite/ndb/r/ndb_auto_increment.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/suite/ndb/t/ndb_auto_increment.test
mysql-test/suite/rpl/r/rpl_insert.result
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
mysql-test/suite/rpl/t/rpl_insert.test
mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_dd_partitions.result
mysql-test/t/alter_table.test
mysql-test/t/change_user.test
mysql-test/t/crash_commit_before-master.opt
mysql-test/t/create.test
mysql-test/t/delayed.test
mysql-test/t/disabled.def
mysql-test/t/information_schema_parameters.test
mysql-test/t/information_schema_routines.test
mysql-test/t/merge.test
mysql-test/t/myisam.test
mysql-test/t/mysqldump.test
mysql-test/t/query_cache.test
mysql-test/t/query_cache_debug.test
mysql-test/t/query_cache_merge.test
mysql-test/t/subselect.test
mysql-test/t/variables-big.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/array.c
mysys/checksum.c
mysys/errors.c
mysys/hash.c
mysys/mf_iocache.c
mysys/mf_iocache2.c
mysys/mf_keycache.c
mysys/mf_keycaches.c
mysys/my_bitmap.c
mysys/my_compress.c
mysys/my_error.c
mysys/my_fopen.c
mysys/my_getopt.c
mysys/my_handler.c
mysys/my_handler_errors.h
mysys/my_init.c
mysys/my_lock.c
mysys/my_pread.c
mysys/my_read.c
mysys/my_seek.c
mysys/my_static.c
mysys/my_static.h
mysys/my_sync.c
mysys/my_thr_init.c
mysys/my_winthread.c
mysys/my_write.c
mysys/safemalloc.c
mysys/thr_lock.c
mysys/thr_mutex.c
plugin/daemon_example/daemon_example.cc
scripts/Makefile.am
scripts/mysql_fix_privilege_tables.sh
sql-bench/example
sql/CMakeLists.txt
sql/event_data_objects.cc
sql/events.cc
sql/field.cc
sql/field.h
sql/filesort.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_func.h
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_subselect.cc
sql/item_xmlfunc.cc
sql/lex.h
sql/lock.cc
sql/log.cc
sql/log_event.cc
sql/log_event_old.cc
sql/my_lock.c
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_sum.cc
sql/partition_info.cc
sql/password.c
sql/protocol.cc
sql/rpl_filter.cc
sql/rpl_injector.cc
sql/rpl_injector.h
sql/rpl_rli.cc
sql/set_var.cc
sql/share/errmsg.txt
sql/spatial.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_bitmap.h
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_crypt.cc
sql/sql_crypt.h
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_plugin.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_sort.h
sql/sql_table.cc
sql/sql_tablespace.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_yacc.yy
sql/table.cc
sql/time.cc
sql/unireg.cc
storage/archive/ha_archive.cc
storage/archive/ha_archive.h
storage/csv/ha_tina.cc
storage/csv/ha_tina.h
storage/falcon/AsciiBlob.cpp
storage/falcon/BDB.cpp
storage/falcon/BDB.h
storage/falcon/BinaryBlob.cpp
storage/falcon/Bitmap.cpp
storage/falcon/BlobReference.cpp
storage/falcon/BlobReference.h
storage/falcon/CMakeLists.txt
storage/falcon/Cache.cpp
storage/falcon/Cache.h
storage/falcon/Configuration.cpp
storage/falcon/DataOverflowPage.cpp
storage/falcon/DataOverflowPage.h
storage/falcon/DataPage.cpp
storage/falcon/DataPage.h
storage/falcon/Database.cpp
storage/falcon/Database.h
storage/falcon/DateTime.cpp
storage/falcon/Decompress.cpp
storage/falcon/DeferredIndex.h
storage/falcon/DeferredIndexWalker.cpp
storage/falcon/DeferredIndexWalker.h
storage/falcon/EncodedDataStream.cpp
storage/falcon/EncodedDataStream.h
storage/falcon/Engine.h
storage/falcon/Error.cpp
storage/falcon/Error.h
storage/falcon/Event.cpp
storage/falcon/Format.cpp
storage/falcon/Format.h
storage/falcon/Gopher.cpp
storage/falcon/Hdr.cpp
storage/falcon/Hdr.h
storage/falcon/IO.cpp
storage/falcon/Index.cpp
storage/falcon/Index.h
storage/falcon/IndexPage.cpp
storage/falcon/IndexPage.h
storage/falcon/IndexRootPage.cpp
storage/falcon/IndexRootPage.h
storage/falcon/Interlock.h
storage/falcon/InversionPage.cpp
storage/falcon/InversionPage.h
storage/falcon/License.cpp
storage/falcon/Makefile.am
storage/falcon/MemMgr.cpp
storage/falcon/Page.h
storage/falcon/PageInventoryPage.cpp
storage/falcon/PageInventoryPage.h
storage/falcon/PageWriter.cpp
storage/falcon/PriorityScheduler.cpp
storage/falcon/Protocol.cpp
storage/falcon/Record.cpp
storage/falcon/Record.h
storage/falcon/RecordLeaf.cpp
storage/falcon/RecordLocatorPage.cpp
storage/falcon/RecordLocatorPage.h
storage/falcon/RecordScavenge.cpp
storage/falcon/RecordScavenge.h
storage/falcon/RecordVersion.cpp
storage/falcon/RecordVersion.h
storage/falcon/SQLError.cpp
storage/falcon/SQLException.h
storage/falcon/SRLDropTable.cpp
storage/falcon/SRLDropTableSpace.cpp
storage/falcon/Section.cpp
storage/falcon/SectionPage.cpp
storage/falcon/SectionPage.h
storage/falcon/SerialLog.cpp
storage/falcon/SerialLog.h
storage/falcon/SerialLogFile.cpp
storage/falcon/SerialLogFile.h
storage/falcon/SerialLogTransaction.cpp
storage/falcon/SerialLogTransaction.h
storage/falcon/Socket.cpp
storage/falcon/Socket.h
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageDatabase.h
storage/falcon/StorageHandler.cpp
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/Stream.cpp
storage/falcon/Stream.h
storage/falcon/StreamSegment.cpp
storage/falcon/SymbolManager.cpp
storage/falcon/SyncObject.cpp
storage/falcon/SyncObject.h
storage/falcon/SyncTest.cpp
storage/falcon/SyncTest.h
storage/falcon/Synchronize.cpp
storage/falcon/Synchronize.h
storage/falcon/Table.cpp
storage/falcon/Table.h
storage/falcon/TableSpaceManager.cpp
storage/falcon/TableSpaceManager.h
storage/falcon/Thread.cpp
storage/falcon/Thread.h
storage/falcon/TimeStamp.cpp
storage/falcon/TimeStamp.h
storage/falcon/Transaction.cpp
storage/falcon/Transaction.h
storage/falcon/TransactionManager.cpp
storage/falcon/TransactionManager.h
storage/falcon/TransformLib/Makefile.am
storage/falcon/Types.h
storage/falcon/Value.cpp
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/heap/hp_write.c
storage/myisam/CMakeLists.txt
storage/myisam/Makefile.am
storage/myisam/ft_boolean_search.c
storage/myisam/ft_static.c
storage/myisam/ft_stopwords.c
storage/myisam/fulltext.h
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
storage/myisam/mi_cache.c
storage/myisam/mi_check.c
storage/myisam/mi_checksum.c
storage/myisam/mi_close.c
storage/myisam/mi_create.c
storage/myisam/mi_dbug.c
storage/myisam/mi_delete.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_extra.c
storage/myisam/mi_key.c
storage/myisam/mi_locking.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_packrec.c
storage/myisam/mi_range.c
storage/myisam/mi_rkey.c
storage/myisam/mi_search.c
storage/myisam/mi_test1.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisam/plug.in
storage/myisam/rt_index.c
storage/myisam/rt_test.c
storage/myisam/sort.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/ha_myisammrg.h
strings/CMakeLists.txt
strings/bmove512.c
strings/ctype.c
strings/my_vsnprintf.c
strings/strmake.c
support-files/compiler_warnings.supp
support-files/magic
support-files/mysql.spec.sh
tests/mysql_client_test.c
unittest/Makefile.am
unittest/mysys/Makefile.am
unittest/mysys/my_atomic-t.c
unittest/mytap/tap.c
unittest/mytap/tap.h
unittest/unit.pl
win/configure.js
mysql-test/suite/falcon/r/falcon_bug_22169-big.result
mysql-test/suite/falcon_team/r/falcon_bug_22189.result
mysql-test/suite/falcon_team/r/falcon_bug_23692.result
mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result
mysql-test/suite/falcon_team/r/ps_8falcon.result
mysql-test/suite/falcon/t/falcon_bug_22169-big.test
mysql-test/suite/falcon_team/t/falcon_bug_22189.test
mysql-test/suite/falcon_team/t/falcon_bug_23692.test
mysql-test/suite/falcon_team/t/falcon_bug_27997.test
mysql-test/suite/falcon_team/t/falcon_bug_30826.test
mysql-test/suite/falcon/r/falcon_bug_22150-big.result
mysql-test/suite/falcon/t/falcon_bug_22150-big.test
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
=== modified file 'mysql-test/suite/funcs_1/datadict/charset_collation.inc'
--- a/mysql-test/suite/funcs_1/datadict/charset_collation.inc 2008-03-07 16:33:07 +0000
+++ b/mysql-test/suite/funcs_1/datadict/charset_collation.inc 2008-06-30 20:16:06 +0000
@@ -8,7 +8,7 @@
#
# The amount and properties of character_sets/collations depend on the
# build type
-# 2007-12 MySQL 5.0
+# 2007-12 MySQL 5.0, 2008-06 MySQL 5.1
# ---------------------------------------------------------------------
#
# Variant 1 fits to
@@ -33,10 +33,22 @@
# Variant 3 fits to
# version_comment MySQL Community Server (GPL)
# version_comment MySQL Cluster Server (Commercial)
+# version_comment MySQL Advanced Server (GPL) 5.1
+# version_comment MySQL Advanced Server (Commercial) 5.1
#
# Difference between variant 3 and 2 is within the collation properties
# IS_COMPILED and SORTLEN.
#
+# 2008-06 All time excluded variant is "vanilla".
+# How to build "vanilla":
+# ./BUILD/autorun.sh
+# ./configure
+# ./make
+# Some properties of "vanilla"
+# version_comment Source distribution
+# Compared to the variants 1 to 3 a lot of character sets are missing.
+# Example: "ucs2_bin" is in variant 1 to 3 but not in "vanilla".
+#
# Created:
# 2007-12-18 mleich - remove the unstable character_set/collation subtests
# from include/datadict-master.inc
=== modified file 'mysql-test/suite/funcs_1/t/charset_collation_1.test'
--- a/mysql-test/suite/funcs_1/t/charset_collation_1.test 2008-03-10 19:00:02 +0000
+++ b/mysql-test/suite/funcs_1/t/charset_collation_1.test 2008-07-01 15:47:05 +0000
@@ -22,9 +22,11 @@ if (`SELECT EXISTS (SELECT 1 FROM inform
OR ( @@version_comment NOT LIKE '%Source%'
AND @@version_comment NOT LIKE '%Enterprise%'
AND @@version_comment NOT LIKE '%Classic%'
- AND @@version_comment NOT LIKE '%Pushbuild%')`)
+ AND @@version_comment NOT LIKE '%Pushbuild%')
+ OR (SELECT count(*) = 0 FROM information_schema.collations
+ WHERE collation_name = 'ucs2_bin')`)
{
- skip Test needs Enterprise, Classic , Pushbuild or Source-without-max build;
+ skip Test needs Enterprise, Classic , regular Pushbuild or Source-without-max build;
}
--source suite/funcs_1/datadict/charset_collation.inc
=== modified file 'mysql-test/suite/funcs_1/t/charset_collation_3.test'
--- a/mysql-test/suite/funcs_1/t/charset_collation_3.test 2008-03-07 16:33:07 +0000
+++ b/mysql-test/suite/funcs_1/t/charset_collation_3.test 2008-06-30 20:16:06 +0000
@@ -16,9 +16,10 @@
#
if (`SELECT @@version_comment NOT LIKE '%Community%'
- AND @@version_comment NOT LIKE '%Cluster%'`)
+ AND @@version_comment NOT LIKE '%Cluster%'
+ AND @@version_comment NOT LIKE '%Advanced%'`)
{
- skip Test needs Community or Cluster build;
+ skip Test needs Community, Cluster or Advanced build;
}
--source suite/funcs_1/datadict/charset_collation.inc
=== modified file 'mysql-test/suite/funcs_1/t/disabled.def'
--- a/mysql-test/suite/funcs_1/t/disabled.def 2008-06-27 16:56:39 +0000
+++ b/mysql-test/suite/funcs_1/t/disabled.def 2008-07-01 15:47:05 +0000
@@ -16,4 +16,3 @@ falcon_storedproc: Bug#37525 funcs_1: <e
memory_storedproc: Bug#37525 funcs_1: <engine>_storedproc.test fail
myisam_storedproc: Bug#37525 funcs_1: <engine>_storedproc.test fail
ndb_storedproc: Bug#37525 funcs_1: <engine>_storedproc.test fail
-charset_collation_1 : Bug #36787 Test funcs_1.charset_collation_1 failing
=== modified file 'storage/falcon/Makefile.am'
--- a/storage/falcon/Makefile.am 2008-06-19 15:09:45 +0000
+++ b/storage/falcon/Makefile.am 2008-07-08 11:52:51 +0000
@@ -380,7 +380,7 @@ noinst_HEADERS= $(falcon_headers) \
EXTRA_LTLIBRARIES= ha_falcon.la
pkglib_LTLIBRARIES= @plugin_falcon_shared_target@
-ha_falcon_la_LDFLAGS= -module -rpath $(pkglibdir) -lstdc++
+ha_falcon_la_LDFLAGS= -module -rpath $(pkglibdir)
ha_falcon_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_falcon_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_falcon_la_LIBADD= TransformLib/libtransform.la
| Thread |
|---|
| • bzr push into mysql-6.0 branch (df:2673 to 2675) | Daniel Fischer | 8 Jul |
