2652 Sergey Petrunia 2008-10-15
Post-merge fixes: Makefile.am should list windows-only files in EXTRA_DIST.
modified:
mysys/Makefile.am
2651 Sergey Petrunia 2008-10-15 [merge]
mysql-6.0->mysql-6.0-bka-preview merge part2
removed:
mysql-test/r/rpl_slave-running.result
mysql-test/r/rpl_slave-stopped.result
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
storage/archive/azio.h
added:
mysql-test/extra/rpl_tests/rpl_blackhole.test
mysql-test/r/rpl_slave-running.result
mysql-test/r/rpl_slave-stopped.result
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/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/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/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/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/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
mysys/my_winerr.c
mysys/my_winfile.c
storage/archive/azio.h
win/build-vs9.bat.moved
win/build-vs9_x64.bat.moved
renamed:
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/t/rpl_truncate_7ndb_2-master.opt => mysql-test/suite/rpl_ndb_big/t/rpl_truncate_7ndb_2-master.opt
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
modified:
.bzrignore
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/mysqlbinlog.cc
client/mysqldump.c
client/mysqlslap.c
client/readline.cc
configure.in
extra/Makefile.am
include/config-win.h
include/hash.h
include/my_dir.h
include/my_global.h
include/my_sys.h
include/thr_lock.h
libmysql/CMakeLists.txt
man/Makefile.am
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/binlog_tests/blackhole.test
mysql-test/extra/binlog_tests/innodb_stat.test
mysql-test/extra/rpl_tests/rpl_EE_err.test
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/include/grant_cache.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/auto_increment.result
mysql-test/r/compare.result
mysql-test/r/create.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/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/index_merge_myisam.result
mysql-test/r/information_schema_db.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/mysqldump-max.result
mysql-test/r/mysqldump.result
mysql-test/r/partition.result
mysql-test/r/partition_error.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/trigger-trans.result
mysql-test/r/tx_isolation_func.result
mysql-test/r/type_datetime.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_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_22175.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/falcon_bug_22175.test
mysql-test/suite/falcon/t/rpl_bug_33688.test
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
mysql-test/suite/funcs_1/views/func_view.inc
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/ndb/t/ndb_alter_table_online.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/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_innodb.result
mysql-test/suite/parts/r/partition_alter1_1_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/t/disabled.def
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_sp.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_temporary.test
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/create.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/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/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/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_mgm_err2.test
mysql-test/t/rpl_slave_allow_batching_basic.test.moved
mysql-test/t/rpl_slave_compressed_protocol_basic.test.moved
mysql-test/t/rpl_slave_exec_mode_basic.test.moved
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/symlink.test
mysql-test/t/trigger-trans.test
mysql-test/t/tx_isolation_func.test
mysql-test/t/type_datetime.test
mysql-test/t/type_set.test
mysql-test/t/union.test
mysql-test/t/user_var.test
mysql-test/t/view_grant.test
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/default_modify.c
mysys/hash.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_sync.c
mysys/my_write.c
mysys/mysys_priv.h
scripts/make_binary_distribution.sh
scripts/make_win_bin_dist
scripts/mysql_system_tables_data.sql
sql/discover.cc
sql/event_db_repository.cc
sql/event_parse_data.cc
sql/event_parse_data.h
sql/field.cc
sql/field.h
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/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/parse_file.cc
sql/parse_file.h
sql/partition_info.h
sql/scheduler.cc
sql/set_var.cc
sql/set_var.h
sql/si_objects.cc
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_db.cc
sql/sql_derived.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_select.cc
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/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/Interlock.h
storage/innobase/handler/ha_innodb.cc
storage/maria/CMakeLists.txt
storage/myisam/mi_locking.c
storage/myisam/myisam_ftdump.c
strings/ctype-czech.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
vio/viosocket.c
win/README
win/create_manifest.js
zlib/gzio.c
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
=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am 2008-10-15 01:19:02 +0000
+++ b/mysys/Makefile.am 2008-10-15 03:41:12 +0000
@@ -73,10 +73,10 @@ libmysyslt_la_SOURCES = my_init.c my_get
my_windac.c my_access.c base64.c \
wqueue.c \
thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
- thr_mutex.c thr_rwlock.c \
+ thr_mutex.c thr_rwlock.c
+EXTRA_DIST = CMakeLists.txt \
mf_soundex.c \
my_conio.c my_wincond.c my_winthread.c my_winerr.c my_winfile.c
-EXTRA_DIST = CMakeLists.txt
DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \
@@ -87,5 +87,6 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\"
-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
@DEFS@
+
# Don't update the files from bitkeeper
%::SCCS/s.%
| Thread |
|---|
| • bzr push into mysql-6.0-bka-preview branch (sergefp:2651 to 2652) | Sergey Petrunia | 16 Oct |
