List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:November 4 2008 11:30am
Subject:bzr push into mysql-6.0 branch (vvaintroub:2675 to 2676)
View as plain text  
 2676 Vladislav Vaintroub	2008-11-03
       Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from 
      TARGET_LINK_LIBRARIES. 
      
      Every exe or dll linked with mysys needs ws2_32, because
      mysys uses winsock function WSAStartup in my_init().
      However, there is no need to explicitely add ws2_32 to
      the list of TARGET_LINK_LIBRARIES multiple times. 
      Visual Studio comes with a handy pragma that tells linker
      to add library. So patch replaces bunch of ws2_32 in 
      CMakeLists with  single pragma comment(lib,"ws2_32")
      in my_init.c
      
      Additionally, reference to non-existing "debug" library
      has been removed from TARGET_LINK_LIBRARIES. The correct
      name of the library is "dbug".
modified:
  client/CMakeLists.txt
  extra/CMakeLists.txt
  libmysql/CMakeLists.txt
  libmysqld/CMakeLists.txt
  libmysqld/examples/CMakeLists.txt
  mysys/my_init.c
  scripts/CMakeLists.txt
  sql/CMakeLists.txt
  sql/udf_example.c
  storage/maria/CMakeLists.txt
  storage/maria/unittest/CMakeLists.txt
  storage/myisam/CMakeLists.txt
  tests/CMakeLists.txt
  unittest/mysys/CMakeLists.txt

 2675 Vladislav Vaintroub	2008-10-31 [merge]
      merge
removed:
  include/mysql_h.ic
  libmysql/dll.c
  mysql-test/include/wait_condition.inc.moved
  mysql-test/r/rpl_slave-running.result
  mysql-test/r/rpl_slave-stopped.result
  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
  sql/backup/backup_progress.cc
  sql/backup/backup_progress.h
  storage/archive/azio.h
  unittest/mysys/CMakeLists.txt
added:
  include/mysql.h.pp
  include/mysql/plugin.h.pp
  include/waiting_threads.h
  mysql-test/extra/rpl_tests/rpl_blackhole.test
  mysql-test/r/rpl_slave-running.result
  mysql-test/r/rpl_slave-stopped.result
  mysql-test/r/test_wl4435.result
  mysql-test/suite/backup/
  mysql-test/suite/backup/r/
  mysql-test/suite/backup/r/backup_blob.result
  mysql-test/suite/backup/r/backup_commit_backup.result
  mysql-test/suite/backup/r/backup_logs_output.result
  mysql-test/suite/backup/r/backup_securefilepriv.result
  mysql-test/suite/backup/t/
  mysql-test/suite/backup/t/backup_blob.test
  mysql-test/suite/backup/t/backup_commit_backup.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/disabled.def
  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_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/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/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_39342.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/r/falcon_year_4digit.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_39342.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/t/falcon_year_4digit.test
  mysql-test/suite/falcon_team/t/test2bug.def
  mysql-test/suite/funcs_1/storedproc/param_check.inc
  mysql-test/suite/maria/
  mysql-test/suite/maria/r/
  mysql-test/suite/maria/r/maria-lock.result
  mysql-test/suite/maria/r/maria_partition.result
  mysql-test/suite/maria/t/
  mysql-test/suite/maria/t/maria-lock.test
  mysql-test/suite/maria/t/maria_partition.test
  mysql-test/suite/ndb/r/ndb_dd_is_talbespaces.result
  mysql-test/suite/ndb/t/ndb_dd_is_talbespaces.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/waiting_threads.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
  storage/maria/unittest/ma_pagecache_rwconsist2.c
  unittest/mysys/CMakeLists.txt
  unittest/mysys/lf-t.c
  unittest/mysys/thr_template.c
  unittest/mysys/waiting_threads-t.c
renamed:
  mysql-test/r/backup.result => mysql-test/suite/backup/r/backup.result
  mysql-test/r/backup_backupdir.result => mysql-test/suite/backup/r/backup_backupdir.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_concurrent.result => mysql-test/suite/backup/r/backup_concurrent.result
  mysql-test/r/backup_db_grants.result => mysql-test/suite/backup/r/backup_db_grants.result
  mysql-test/r/backup_ddl_blocker.result => mysql-test/suite/backup/r/backup_ddl_blocker.result
  mysql-test/r/backup_default.result => mysql-test/suite/backup/r/backup_default.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_timeout.result => mysql-test/suite/backup/r/backup_timeout.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/r/maria-autozerofill.result => mysql-test/suite/maria/r/maria-autozerofill.result
  mysql-test/r/maria-big.result => mysql-test/suite/maria/r/maria-big.result
  mysql-test/r/maria-big2.result => mysql-test/suite/maria/r/maria-big2.result
  mysql-test/r/maria-connect.result => mysql-test/suite/maria/r/maria-connect.result
  mysql-test/r/maria-gis-rtree-dynamic.result => mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
  mysql-test/r/maria-gis-rtree-trans.result => mysql-test/suite/maria/r/maria-gis-rtree-trans.result
  mysql-test/r/maria-gis-rtree.result => mysql-test/suite/maria/r/maria-gis-rtree.result
  mysql-test/r/maria-mvcc.result => mysql-test/suite/maria/r/maria-mvcc.result
  mysql-test/r/maria-no-logging.result => mysql-test/suite/maria/r/maria-no-logging.result
  mysql-test/r/maria-page-checksum.result => mysql-test/suite/maria/r/maria-page-checksum.result
  mysql-test/r/maria-preload.result => mysql-test/suite/maria/r/maria-preload.result
  mysql-test/r/maria-purge.result => mysql-test/suite/maria/r/maria-purge.result
  mysql-test/r/maria-recover.result => mysql-test/suite/maria/r/maria-recover.result
  mysql-test/r/maria-recovery-big.result => mysql-test/suite/maria/r/maria-recovery-big.result
  mysql-test/r/maria-recovery-bitmap.result => mysql-test/suite/maria/r/maria-recovery-bitmap.result
  mysql-test/r/maria-recovery-rtree-ft.result => mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
  mysql-test/r/maria-recovery.result => mysql-test/suite/maria/r/maria-recovery.result
  mysql-test/r/maria-recovery2.result => mysql-test/suite/maria/r/maria-recovery2.result
  mysql-test/r/maria.result => mysql-test/suite/maria/r/maria.result
  mysql-test/r/maria2.result => mysql-test/suite/maria/r/maria2.result
  mysql-test/r/maria3.result => mysql-test/suite/maria/r/maria3.result
  mysql-test/r/maria_notembedded.result => mysql-test/suite/maria/r/maria_notembedded.result
  mysql-test/r/ps_maria.result => mysql-test/suite/maria/r/ps_maria.result
  mysql-test/suite/backup => mysql-test/suite/backup_engines
  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_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/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
  mysql-test/t/backup.test => mysql-test/suite/backup/t/backup.test
  mysql-test/t/backup_backupdir.test => mysql-test/suite/backup/t/backup_backupdir.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_concurrent.test => mysql-test/suite/backup/t/backup_concurrent.test
  mysql-test/t/backup_db_grants.test => mysql-test/suite/backup/t/backup_db_grants.test
  mysql-test/t/backup_ddl_blocker.test => mysql-test/suite/backup/t/backup_ddl_blocker.test
  mysql-test/t/backup_default.test => mysql-test/suite/backup/t/backup_default.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_timeout.test => mysql-test/suite/backup/t/backup_timeout.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
  mysql-test/t/maria-autozerofill.test => mysql-test/suite/maria/t/maria-autozerofill.test
  mysql-test/t/maria-big.test => mysql-test/suite/maria/t/maria-big.test
  mysql-test/t/maria-big2.test => mysql-test/suite/maria/t/maria-big2.test
  mysql-test/t/maria-connect.test => mysql-test/suite/maria/t/maria-connect.test
  mysql-test/t/maria-gis-rtree-dynamic.test => mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test
  mysql-test/t/maria-gis-rtree-trans.test => mysql-test/suite/maria/t/maria-gis-rtree-trans.test
  mysql-test/t/maria-gis-rtree.test => mysql-test/suite/maria/t/maria-gis-rtree.test
  mysql-test/t/maria-mvcc.test => mysql-test/suite/maria/t/maria-mvcc.test
  mysql-test/t/maria-no-logging.test => mysql-test/suite/maria/t/maria-no-logging.test
  mysql-test/t/maria-page-checksum.test => mysql-test/suite/maria/t/maria-page-checksum.test
  mysql-test/t/maria-preload.test => mysql-test/suite/maria/t/maria-preload.test
  mysql-test/t/maria-purge.test => mysql-test/suite/maria/t/maria-purge.test
  mysql-test/t/maria-recover-master.opt => mysql-test/suite/maria/t/maria-recover-master.opt
  mysql-test/t/maria-recover.test => mysql-test/suite/maria/t/maria-recover.test
  mysql-test/t/maria-recovery-big-master.opt => mysql-test/suite/maria/t/maria-recovery-big-master.opt
  mysql-test/t/maria-recovery-big.test => mysql-test/suite/maria/t/maria-recovery-big.test
  mysql-test/t/maria-recovery-bitmap-master.opt => mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt
  mysql-test/t/maria-recovery-bitmap.test => mysql-test/suite/maria/t/maria-recovery-bitmap.test
  mysql-test/t/maria-recovery-master.opt => mysql-test/suite/maria/t/maria-recovery-master.opt
  mysql-test/t/maria-recovery-rtree-ft-master.opt => mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt
  mysql-test/t/maria-recovery-rtree-ft.test => mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
  mysql-test/t/maria-recovery.test => mysql-test/suite/maria/t/maria-recovery.test
  mysql-test/t/maria-recovery2-master.opt => mysql-test/suite/maria/t/maria-recovery2-master.opt
  mysql-test/t/maria-recovery2.test => mysql-test/suite/maria/t/maria-recovery2.test
  mysql-test/t/maria.test => mysql-test/suite/maria/t/maria.test
  mysql-test/t/maria2.test => mysql-test/suite/maria/t/maria2.test
  mysql-test/t/maria3.test => mysql-test/suite/maria/t/maria3.test
  mysql-test/t/maria_notembedded.test => mysql-test/suite/maria/t/maria_notembedded.test
  mysql-test/t/ps_maria.test => mysql-test/suite/maria/t/ps_maria.test
modified:
  .bzr-mysql/default.conf
  .bzrignore
  BUILD/compile-dist
  BUILD/compile-solaris-amd64-forte*
  BUILD/compile-solaris-amd64-forte-debug
  BUILD/compile-solaris-sparc
  BUILD/compile-solaris-sparc-forte*
  Makefile.am
  client/Makefile.am
  client/mysqldump.c
  client/mysqltest.c
  configure.in
  extra/CMakeLists.txt
  extra/Makefile.am
  include/Makefile.am
  include/atomic/generic-msvc.h
  include/errmsg.h
  include/hash.h
  include/lf.h
  include/maria.h
  include/my_alloc.h
  include/my_base.h
  include/my_global.h
  include/my_handler.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/Makefile.shared
  libmysql/client_settings.h
  libmysql/errmsg.c
  libmysql/libmysql.c
  libmysql/libmysql.def
  libmysqld/CMakeLists.txt
  libmysqld/Makefile.am
  libmysqld/lib_sql.cc
  libmysqld/libmysqld.c
  libmysqld/libmysqld.def
  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/1st.result
  mysql-test/r/auto_increment.result
  mysql-test/r/binlog_format_basic.result
  mysql-test/r/compare.result
  mysql-test/r/connect.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/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/index_merge_myisam.result
  mysql-test/r/information_schema-big.result
  mysql-test/r/information_schema.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.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/mysql.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/plugin.result
  mysql-test/r/ps.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/storage_engine_basic.result
  mysql-test/r/subselect_debug.result
  mysql-test/r/sync_frm_basic.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_datetime.result
  mysql-test/r/type_set.result
  mysql-test/r/union.result
  mysql-test/r/user_var.result
  mysql-test/r/variables.result
  mysql-test/r/view_grant.result
  mysql-test/std_data/Index.xml
  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_triggers.test
  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_bugs.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_22154-big.test
  mysql-test/suite/falcon/t/falcon_bug_22175.test
  mysql-test/suite/falcon/t/falcon_bug_22972.test
  mysql-test/suite/falcon/t/falcon_bug_34164.test
  mysql-test/suite/falcon/t/falcon_bug_34890.test
  mysql-test/suite/falcon/t/falcon_bugs.test
  mysql-test/suite/falcon/t/falcon_bugs2.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_val_no_prot.result
  mysql-test/suite/funcs_1/views/func_view.inc
  mysql-test/suite/ndb/r/ndb_dd_dump.result
  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_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_ndb_log.result
  mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
  mysql-test/t/auto_increment.test
  mysql-test/t/binlog_format_basic.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/events_bugs.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.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/merge.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/ps.test
  mysql-test/t/ps_1general.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/slow_launch_time_func.test
  mysql-test/t/sp-error.test
  mysql-test/t/sp.test
  mysql-test/t/status.test
  mysql-test/t/subselect3.test
  mysql-test/t/subselect_debug.test
  mysql-test/t/symlink.test
  mysql-test/t/sync_frm_basic.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_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/array.c
  mysys/hash.c
  mysys/lf_alloc-pin.c
  mysys/lf_hash.c
  mysys/my_largepage.c
  mysys/my_pread.c
  mysys/my_static.c
  mysys/my_thr_init.c
  mysys/my_wincond.c
  mysys/stacktrace.c
  mysys/thr_rwlock.c
  scripts/make_binary_distribution.sh
  scripts/make_win_bin_dist
  scripts/mysql_system_tables.sql
  scripts/mysql_system_tables_data.sql
  scripts/mysql_system_tables_fix.sql
  sql-common/client.c
  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/error.h
  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/debug_sync.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/filesort.cc
  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/net_serv.cc
  sql/opt_range.cc
  sql/parse_file.cc
  sql/parse_file.h
  sql/partition_info.h
  sql/probes.d
  sql/probes.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/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/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_delete.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/blackhole/ha_blackhole.cc
  storage/blackhole/ha_blackhole.h
  storage/falcon/BDB.cpp
  storage/falcon/BDB.h
  storage/falcon/Bitmap.cpp
  storage/falcon/Bitmap.h
  storage/falcon/CMakeLists.txt
  storage/falcon/Cache.cpp
  storage/falcon/Configuration.cpp
  storage/falcon/Connection.h
  storage/falcon/DataPage.h
  storage/falcon/Database.cpp
  storage/falcon/Database.h
  storage/falcon/Dbb.cpp
  storage/falcon/DeferredIndex.cpp
  storage/falcon/DeferredIndex.h
  storage/falcon/DeferredIndexWalker.cpp
  storage/falcon/Error.cpp
  storage/falcon/IO.cpp
  storage/falcon/IOx.h
  storage/falcon/Index.cpp
  storage/falcon/InfoTable.cpp
  storage/falcon/InfoTable.h
  storage/falcon/Makefile.am
  storage/falcon/MemoryManager.h
  storage/falcon/NNode.h
  storage/falcon/Record.cpp
  storage/falcon/Record.h
  storage/falcon/RecordGroup.cpp
  storage/falcon/RecordGroup.h
  storage/falcon/RecordLeaf.cpp
  storage/falcon/RecordLeaf.h
  storage/falcon/RecordScavenge.cpp
  storage/falcon/RecordSection.h
  storage/falcon/RecordVersion.cpp
  storage/falcon/RecordVersion.h
  storage/falcon/RecoveryObjects.cpp
  storage/falcon/SQLException.h
  storage/falcon/SRLUpdateIndex.cpp
  storage/falcon/SRLUpdateRecords.cpp
  storage/falcon/Scavenger.cpp
  storage/falcon/Scavenger.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/StorageConnection.cpp
  storage/falcon/StorageConnection.h
  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/TableSpaceManager.cpp
  storage/falcon/TableSpaceManager.h
  storage/falcon/Transaction.cpp
  storage/falcon/Transaction.h
  storage/falcon/TransactionManager.cpp
  storage/falcon/Types.h
  storage/falcon/WalkDeferred.cpp
  storage/falcon/ha_falcon.cpp
  storage/falcon/ha_falcon.h
  storage/falcon/plug.in
  storage/innobase/handler/ha_innodb.cc
  storage/maria/ha_maria.cc
  storage/maria/ma_bitmap.c
  storage/maria/ma_blockrec.c
  storage/maria/ma_blockrec.h
  storage/maria/ma_check.c
  storage/maria/ma_checkpoint.c
  storage/maria/ma_close.c
  storage/maria/ma_commit.c
  storage/maria/ma_create.c
  storage/maria/ma_delete.c
  storage/maria/ma_delete_table.c
  storage/maria/ma_extra.c
  storage/maria/ma_init.c
  storage/maria/ma_key_recover.c
  storage/maria/ma_key_recover.h
  storage/maria/ma_locking.c
  storage/maria/ma_loghandler.c
  storage/maria/ma_open.c
  storage/maria/ma_page.c
  storage/maria/ma_pagecache.c
  storage/maria/ma_pagecache.h
  storage/maria/ma_preload.c
  storage/maria/ma_recovery.c
  storage/maria/ma_rename.c
  storage/maria/ma_search.c
  storage/maria/ma_state.c
  storage/maria/ma_static.c
  storage/maria/ma_write.c
  storage/maria/maria_chk.c
  storage/maria/maria_def.h
  storage/maria/trnman.c
  storage/maria/trnman.h
  storage/maria/trnman_public.h
  storage/maria/unittest/CMakeLists.txt
  storage/maria/unittest/Makefile.am
  storage/maria/unittest/ma_pagecache_rwconsist.c
  storage/maria/unittest/ma_pagecache_single.c
  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/trnman-t.c
  storage/myisam/ha_myisam.cc
  storage/myisam/mi_check.c
  storage/myisam/mi_examine_log.c
  storage/myisam/mi_open.c
  storage/myisam/mi_page.c
  storage/myisam/mi_search.c
  storage/myisam/mi_test_all.sh
  storage/myisam/rt_index.c
  strings/ctype-czech.c
  strings/my_vsnprintf.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
  unittest/mysys/Makefile.am
  unittest/mysys/my_atomic-t.c
  unittest/mytap/tap.c
  win/create_manifest.js
  zlib/gzio.c
  mysql-test/suite/backup/r/backup.result
  mysql-test/suite/backup/r/backup_backupdir.result
  mysql-test/suite/backup/r/backup_commit_restore.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_tablespace.result
  mysql-test/suite/backup/r/backup_triggers_and_events.result
  mysql-test/suite/maria/r/maria.result
  mysql-test/suite/maria/r/maria3.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_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_backupdir.test
  mysql-test/suite/backup/t/backup_commit_restore.test
  mysql-test/suite/backup/t/backup_ddl_blocker.test
  mysql-test/suite/backup/t/backup_errors.test
  mysql-test/suite/backup/t/backup_fkey.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_security.test
  mysql-test/suite/backup/t/backup_triggers_and_events.test
  mysql-test/suite/maria/t/maria.test
  mysql-test/suite/maria/t/maria3.test

=== modified file 'client/CMakeLists.txt'
--- a/client/CMakeLists.txt	2008-08-05 18:43:56 +0000
+++ b/client/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -30,27 +30,27 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
                     ${CMAKE_SOURCE_DIR}/strings)
 
 ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc ../mysys/my_conio.c)
-TARGET_LINK_LIBRARIES(mysql mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(mysql mysqlclient)
 
 ADD_EXECUTABLE(mysqltest mysqltest.c)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
-TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys regex ws2_32 dbug)
+TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys regex dbug)
 
 ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
 
 ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c ../mysys/mf_getdate.c)
-TARGET_LINK_LIBRARIES(mysqldump mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
 
 ADD_EXECUTABLE(mysqlimport mysqlimport.c)
-TARGET_LINK_LIBRARIES(mysqlimport mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
 
 ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c ../mysys/my_getpagesize.c)
-TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
 
 ADD_EXECUTABLE(mysqlshow mysqlshow.c)
-TARGET_LINK_LIBRARIES(mysqlshow mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
 
 ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc
 			   ../mysys/mf_tempdir.c
@@ -59,14 +59,14 @@ ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.c
 			   ../mysys/my_bitmap.c
 			   ../mysys/my_vle.c
 			   ../mysys/base64.c)
-TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
 
 ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
 
 ADD_EXECUTABLE(mysqlslap mysqlslap.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
-TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib ws2_32 dbug)
+TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib dbug)
 
 ADD_EXECUTABLE(echo echo.c)
 

=== modified file 'extra/CMakeLists.txt'
--- a/extra/CMakeLists.txt	2008-09-08 12:07:15 +0000
+++ b/extra/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -20,7 +20,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 ADD_EXECUTABLE(comp_err comp_err.c)
-TARGET_LINK_LIBRARIES(comp_err debug dbug mysys strings zlib ws2_32)
+TARGET_LINK_LIBRARIES(comp_err dbug mysys strings zlib)
 
 GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION)
 
@@ -39,17 +39,17 @@ ADD_CUSTOM_TARGET(GenError
                   DEPENDS ${PROJECT_SOURCE_DIR}/include/mysqld_error.h)
 
 ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-TARGET_LINK_LIBRARIES(my_print_defaults strings mysys debug dbug taocrypt ws2_32)
+TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt)
 
 ADD_EXECUTABLE(perror perror.c)
 ADD_DEPENDENCIES(perror GenError)
-TARGET_LINK_LIBRARIES(perror strings mysys debug dbug ws2_32)
+TARGET_LINK_LIBRARIES(perror strings mysys dbug)
 
 ADD_EXECUTABLE(resolveip resolveip.c)
-TARGET_LINK_LIBRARIES(resolveip strings mysys debug dbug ws2_32)
+TARGET_LINK_LIBRARIES(resolveip strings mysys dbug)
 
 ADD_EXECUTABLE(replace replace.c)
-TARGET_LINK_LIBRARIES(replace strings mysys debug dbug ws2_32)
+TARGET_LINK_LIBRARIES(replace strings mysys dbug)
 
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("myTest" "asInvoker")

=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2008-10-31 18:02:34 +0000
+++ b/libmysql/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -108,4 +108,4 @@ TARGET_LINK_LIBRARIES(mysqlclient)
 
 ADD_LIBRARY(libmysql          SHARED ${CLIENT_SOURCES} libmysql.def)
 ADD_DEPENDENCIES(libmysql GenError)
-TARGET_LINK_LIBRARIES(libmysql ws2_32)
\ No newline at end of file
+TARGET_LINK_LIBRARIES(libmysql)
\ No newline at end of file

=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2008-10-31 18:02:34 +0000
+++ b/libmysqld/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -216,4 +216,4 @@ TARGET_LINK_LIBRARIES(mysqlserver)
 
 ADD_LIBRARY(libmysqld MODULE cmake_dummy.c libmysqld.def)
 ADD_DEPENDENCIES(libmysqld mysqlserver)
-TARGET_LINK_LIBRARIES(libmysqld mysqlserver ws2_32)
+TARGET_LINK_LIBRARIES(libmysqld mysqlserver)

=== modified file 'libmysqld/examples/CMakeLists.txt'
--- a/libmysqld/examples/CMakeLists.txt	2008-08-05 18:43:56 +0000
+++ b/libmysqld/examples/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -26,13 +26,13 @@ ADD_DEFINITIONS(-DEMBEDDED_LIBRARY)
 ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc
                ../../client/mysql.cc ../../client/readline.cc
                ../../client/sql_string.cc)
-TARGET_LINK_LIBRARIES(mysql_embedded mysys yassl taocrypt zlib debug dbug regex strings ws2_32)
+TARGET_LINK_LIBRARIES(mysql_embedded mysys yassl taocrypt zlib dbug regex strings)
 ADD_DEPENDENCIES(mysql_embedded libmysqld)
 
 ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.c)
-TARGET_LINK_LIBRARIES(mysqltest_embedded mysys yassl taocrypt zlib debug dbug regex strings ws2_32)
+TARGET_LINK_LIBRARIES(mysqltest_embedded mysys yassl taocrypt zlib dbug regex strings)
 ADD_DEPENDENCIES(mysqltest_embedded libmysqld)
 
 ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c)
-TARGET_LINK_LIBRARIES(mysql_client_test_embedded debug dbug mysys yassl taocrypt zlib strings ws2_32)
+TARGET_LINK_LIBRARIES(mysql_client_test_embedded dbug mysys yassl taocrypt zlib strings)
 ADD_DEPENDENCIES(mysql_client_test_embedded libmysqld)

=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2008-04-28 16:24:05 +0000
+++ b/mysys/my_init.c	2008-11-03 20:13:35 +0000
@@ -27,6 +27,8 @@
 #ifdef _MSC_VER
 #include <locale.h>
 #include <crtdbg.h>
+/* WSAStartup needs winsock library*/
+#pragma comment(lib, "ws2_32")
 #endif
 my_bool have_tcpip=0;
 static void my_win_init(void);

=== modified file 'scripts/CMakeLists.txt'
--- a/scripts/CMakeLists.txt	2008-03-11 14:46:07 +0000
+++ b/scripts/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -24,7 +24,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOUR
 
 # Build comp_sql - used for embedding SQL in C or C++ programs
 ADD_EXECUTABLE(comp_sql comp_sql.c)
-TARGET_LINK_LIBRARIES(comp_sql debug dbug mysys strings)
+TARGET_LINK_LIBRARIES(comp_sql dbug mysys strings)
 
 # Use comp_sql to build mysql_fix_privilege_tables_sql.c
 GET_TARGET_PROPERTY(COMP_SQL_EXE comp_sql LOCATION)

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2008-10-20 09:16:47 +0000
+++ b/sql/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -89,8 +89,8 @@ ADD_EXECUTABLE(mysqld
                ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
 
 TARGET_LINK_LIBRARIES(mysqld
-                      heap myisam myisammrg mysys yassl zlib debug dbug yassl 
-                      taocrypt strings vio regex ws2_32)
+                      heap myisam myisammrg mysys yassl zlib dbug yassl 
+                      taocrypt strings vio regex)
 
 TARGET_LINK_LIBRARIES(mysqld backup)
 
@@ -148,7 +148,7 @@ ENDIF(WIN32)
 
 # Gen_lex_hash
 ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-TARGET_LINK_LIBRARIES(gen_lex_hash debug dbug mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(gen_lex_hash dbug mysqlclient)
 GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION)
 ADD_CUSTOM_COMMAND(
         OUTPUT ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
@@ -171,7 +171,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDI
 
 ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
 ADD_DEPENDENCIES(udf_example strings GenError)
-TARGET_LINK_LIBRARIES(udf_example strings ws2_32)
+TARGET_LINK_LIBRARIES(udf_example strings)
 
 ADD_SUBDIRECTORY(backup)
 

=== modified file 'sql/udf_example.c'
--- a/sql/udf_example.c	2008-05-29 15:44:11 +0000
+++ b/sql/udf_example.c	2008-11-03 20:13:35 +0000
@@ -139,6 +139,11 @@ typedef long long longlong;
 #include <mysql.h>
 #include <ctype.h>
 
+#ifdef _WIN32
+/* inet_aton needs winsock library */
+#pragma comment(lib, "ws2_32")
+#endif
+
 static pthread_mutex_t LOCK_hostname;
 
 #ifdef HAVE_DLOPEN

=== modified file 'storage/maria/CMakeLists.txt'
--- a/storage/maria/CMakeLists.txt	2008-10-31 18:02:34 +0000
+++ b/storage/maria/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -52,35 +52,35 @@ ADD_LIBRARY(maria ${MARIA_SOURCES})
 ADD_DEPENDENCIES(maria GenError)
 
 ADD_EXECUTABLE(maria_ftdump maria_ftdump.c)
-TARGET_LINK_LIBRARIES(maria_ftdump maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(maria_ftdump maria myisam mysys dbug strings zlib)
 
 ADD_EXECUTABLE(maria_chk maria_chk.c)
-TARGET_LINK_LIBRARIES(maria_chk maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(maria_chk maria myisam mysys dbug strings zlib)
 
 ADD_EXECUTABLE(maria_read_log maria_read_log.c)
-TARGET_LINK_LIBRARIES(maria_read_log maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(maria_read_log maria myisam mysys dbug strings zlib)
 
 ADD_EXECUTABLE(maria_pack maria_pack.c)
-TARGET_LINK_LIBRARIES(maria_pack maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(maria_pack maria myisam mysys dbug strings zlib)
 
 ADD_EXECUTABLE(maria_dump_log ma_loghandler.c unittest/ma_loghandler_examples.c)
-TARGET_LINK_LIBRARIES(maria_dump_log maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(maria_dump_log maria myisam mysys dbug strings zlib)
 SET_TARGET_PROPERTIES(maria_dump_log PROPERTIES COMPILE_FLAGS "-DMARIA_DUMP_LOG")
 
 ADD_EXECUTABLE(ma_test1 ma_test1.c)
-TARGET_LINK_LIBRARIES(ma_test1 maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_test1 maria myisam mysys dbug strings zlib)
 
 ADD_EXECUTABLE(ma_test2 ma_test2.c)
-TARGET_LINK_LIBRARIES(ma_test2 maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_test2 maria myisam mysys dbug strings zlib)
 
 ADD_EXECUTABLE(ma_test3 ma_test3.c)
-TARGET_LINK_LIBRARIES(ma_test3 maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_test3 maria myisam mysys dbug strings zlib)
 
 ADD_EXECUTABLE(ma_rt_test ma_rt_test.c)
-TARGET_LINK_LIBRARIES(ma_rt_test maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_rt_test maria myisam mysys dbug strings zlib)
 
 ADD_EXECUTABLE(ma_sp_test ma_sp_test.c)
-TARGET_LINK_LIBRARIES(ma_sp_test maria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_sp_test maria myisam mysys dbug strings zlib)
 
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("maria_ftdump" "asInvoker")

=== modified file 'storage/maria/unittest/CMakeLists.txt'
--- a/storage/maria/unittest/CMakeLists.txt	2008-10-16 19:44:12 +0000
+++ b/storage/maria/unittest/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -18,7 +18,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
                     ${CMAKE_SOURCE_DIR}/unittest/mytap)
-LINK_LIBRARIES(maria myisam mytap mysys dbug strings wsock32 zlib)
+LINK_LIBRARIES(maria myisam mytap mysys dbug strings zlib)
 
 ADD_EXECUTABLE(ma_control_file-t ma_control_file-t.c)
 ADD_EXECUTABLE(trnman-t trnman-t.c)

=== modified file 'storage/myisam/CMakeLists.txt'
--- a/storage/myisam/CMakeLists.txt	2008-07-09 07:12:43 +0000
+++ b/storage/myisam/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -42,32 +42,32 @@ IF(NOT SOURCE_SUBLIBS)
   ADD_DEPENDENCIES(myisam GenError)
 
   ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c)
-  TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys debug dbug strings zlib ws2_32)
+  TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys dbug strings zlib)
 
   ADD_EXECUTABLE(myisamchk myisamchk.c)
-  TARGET_LINK_LIBRARIES(myisamchk myisam mysys debug dbug strings zlib ws2_32)
+  TARGET_LINK_LIBRARIES(myisamchk myisam mysys dbug strings zlib)
 
   ADD_EXECUTABLE(myisamlog myisamlog.c)
-  TARGET_LINK_LIBRARIES(myisamlog myisam mysys debug dbug strings zlib ws2_32)
+  TARGET_LINK_LIBRARIES(myisamlog myisam mysys dbug strings zlib)
 
   ADD_EXECUTABLE(myisampack myisampack.c)
 
-  TARGET_LINK_LIBRARIES(myisampack myisam mysys debug dbug strings zlib ws2_32)
+  TARGET_LINK_LIBRARIES(myisampack myisam mysys dbug strings zlib)
 
   ADD_EXECUTABLE(mi_test1 mi_test1.c)
-  TARGET_LINK_LIBRARIES(mi_test1 myisam mysys debug dbug strings zlib ws2_32)
+  TARGET_LINK_LIBRARIES(mi_test1 myisam mysys dbug strings zlib)
 
   ADD_EXECUTABLE(mi_test2 mi_test2.c)
-  TARGET_LINK_LIBRARIES(mi_test2 myisam mysys debug dbug strings zlib ws2_32)
+  TARGET_LINK_LIBRARIES(mi_test2 myisam mysys dbug strings zlib)
 
   ADD_EXECUTABLE(mi_test3 mi_test3.c)
-  TARGET_LINK_LIBRARIES(mi_test3  myisam mysys debug dbug strings zlib ws2_32)
+  TARGET_LINK_LIBRARIES(mi_test3  myisam mysys dbug strings zlib)
 
   ADD_EXECUTABLE(sp_test sp_test.c)
-  TARGET_LINK_LIBRARIES(sp_test myisam mysys debug dbug strings zlib ws2_32)
+  TARGET_LINK_LIBRARIES(sp_test myisam mysys dbug strings zlib)
 
   ADD_EXECUTABLE(rt_test rt_test.c)
-  TARGET_LINK_LIBRARIES(rt_test myisam mysys debug dbug strings zlib ws2_32)
+  TARGET_LINK_LIBRARIES(rt_test myisam mysys dbug strings zlib)
   
   IF(EMBED_MANIFESTS)
     MYSQL_EMBED_MANIFEST("myisam_ftdump" "asInvoker")

=== modified file 'tests/CMakeLists.txt'
--- a/tests/CMakeLists.txt	2008-08-05 18:43:56 +0000
+++ b/tests/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -20,7 +20,7 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT")
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 ADD_EXECUTABLE(mysql_client_test mysql_client_test.c ../mysys/my_memmem.c)
-TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient)
 
 ADD_EXECUTABLE(bug25714 bug25714.c)
-TARGET_LINK_LIBRARIES(bug25714 mysqlclient ws2_32)
+TARGET_LINK_LIBRARIES(bug25714 mysqlclient)

=== modified file 'unittest/mysys/CMakeLists.txt'
--- a/unittest/mysys/CMakeLists.txt	2008-10-20 09:16:47 +0000
+++ b/unittest/mysys/CMakeLists.txt	2008-11-03 20:13:35 +0000
@@ -22,16 +22,16 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include
                     ${CMAKE_SOURCE_DIR}/unittest/mytap)
 ADD_EXECUTABLE(bitmap-t bitmap-t.c)
-TARGET_LINK_LIBRARIES(bitmap-t mytap mysys dbug strings ws2_32)
+TARGET_LINK_LIBRARIES(bitmap-t mytap mysys dbug strings)
 
 ADD_EXECUTABLE(base64-t base64-t.c)
-TARGET_LINK_LIBRARIES(base64-t mytap mysys dbug strings ws2_32)
+TARGET_LINK_LIBRARIES(base64-t mytap mysys dbug strings)
 
 ADD_EXECUTABLE(my_atomic-t my_atomic-t.c)
-TARGET_LINK_LIBRARIES(my_atomic-t mytap mysys dbug strings ws2_32)
+TARGET_LINK_LIBRARIES(my_atomic-t mytap mysys dbug strings)
 
 ADD_EXECUTABLE(lf-t lf-t.c)
-TARGET_LINK_LIBRARIES(lf-t mytap mysys dbug strings ws2_32)
+TARGET_LINK_LIBRARIES(lf-t mytap mysys dbug strings)
 
 ADD_EXECUTABLE(waiting_threads-t waiting_threads-t.c)
-TARGET_LINK_LIBRARIES(waiting_threads-t mytap mysys dbug strings ws2_32)
+TARGET_LINK_LIBRARIES(waiting_threads-t mytap mysys dbug strings)

Thread
bzr push into mysql-6.0 branch (vvaintroub:2675 to 2676)Vladislav Vaintroub4 Nov