bzr push into mysql-5.1-telco-7.0 branch (jack:2949)

[jack andrews]

 2949 jack andrews	2009-08-11 [merge]
      merge

    added:
      mysql-test/suite/ndb/t/show_attributes.inc
      mysql-test/suite/ndb/t/show_primary_keys.inc
      mysql-test/suite/ndb/t/show_varpart.inc
    modified:
      configure.in
      include/config-win.h
      mysql-test/include/ndb_backup_id.inc
      mysql-test/mysql-test-run.pl
      mysql-test/suite/funcs_1/datadict/charset_collation.inc
      mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
      mysql-test/suite/funcs_1/datadict/is_routines.inc
      mysql-test/suite/funcs_1/datadict/is_schemata.inc
      mysql-test/suite/funcs_1/datadict/is_tables.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/statistics.inc
      mysql-test/suite/funcs_1/datadict/table_constraints.inc
      mysql-test/suite/funcs_1/datadict/tables.inc
      mysql-test/suite/funcs_1/datadict/tables1.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
      mysql-test/suite/funcs_1/t/is_basics_mixed.test
      mysql-test/suite/funcs_1/t/is_column_privileges.test
      mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
      mysql-test/suite/funcs_1/t/is_columns.test
      mysql-test/suite/funcs_1/t/is_schema_privileges.test
      mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
      mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
      mysql-test/suite/funcs_1/t/is_statistics.test
      mysql-test/suite/funcs_1/t/is_table_constraints.test
      mysql-test/suite/funcs_1/t/is_table_privileges.test
      mysql-test/suite/funcs_1/t/is_user_privileges.test
      mysql-test/suite/funcs_1/t/storedproc.test
      mysql-test/suite/funcs_1/triggers/triggers_03.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc
      mysql-test/suite/funcs_1/triggers/triggers_08.inc
      mysql-test/suite/ndb/my.cnf
      mysql-test/suite/ndb/r/ndb_alter_table.result
      mysql-test/suite/ndb/r/ndb_alter_table_online.result
      mysql-test/suite/ndb/r/ndb_column_properties.result
      mysql-test/suite/ndb/r/ndb_dd_alter.result
      mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
      mysql-test/suite/ndb/r/ndb_partition_key.result
      mysql-test/suite/ndb/t/ndb_alter_table.test
      mysql-test/suite/ndb/t/ndb_alter_table_online.test
      mysql-test/suite/ndb/t/ndb_column_properties.test
      mysql-test/suite/ndb/t/ndb_dd_alter.test
      mysql-test/suite/ndb/t/ndb_dd_restore_compat.test
      mysql-test/suite/ndb/t/ndb_partition_key.test
      mysql-test/suite/ndb/t/ndb_row_format.test
      mysql-test/suite/ndb_team/r/ndb_autodiscover3.result
      mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
      scripts/mysql_system_tables_data.sql
      sql/ha_ndbcluster.cc*
      sql/hostname.cc
      sql/mysql_priv.h
      sql/sql_acl.cc
      sql/sql_connect.cc
      storage/ndb/include/kernel/signaldata/CreateHashMap.hpp
      storage/ndb/include/kernel/signaldata/CreateTable.hpp
      storage/ndb/include/kernel/signaldata/ScanTab.hpp
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
      storage/ndb/src/common/portlib/NdbCondition.c
      storage/ndb/src/common/portlib/NdbTick.c
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/common/util/BaseString.cpp
      storage/ndb/src/common/util/Bitmask.cpp
      storage/ndb/src/common/util/basestring_vsnprintf.c
      storage/ndb/src/common/util/ndb_init.cpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/kernel/main.cpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/include/AtrtClient.hpp
      storage/ndb/test/include/NDBT_Test.hpp
      storage/ndb/test/ndbapi/reorg_tab.cpp
      storage/ndb/test/ndbapi/testIndex.cpp
      storage/ndb/test/ndbapi/testUpgrade.cpp
      storage/ndb/test/run-test/command.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/run-test/db.cpp
      storage/ndb/test/run-test/setup.cpp
      storage/ndb/test/src/AtrtClient.cpp
      storage/ndb/test/tools/copy_tab.cpp
      vio/viosocket.c
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2009-05-27 15:21:45 +0000
+++ b/libmysql/CMakeLists.txt	2009-08-11 01:03:01 +0000
@@ -109,7 +109,7 @@ TARGET_LINK_LIBRARIES(mysqlclient)
 
 ADD_LIBRARY(libmysql          SHARED ${CLIENT_SOURCES} dll.c libmysql.def)
 ADD_DEPENDENCIES(libmysql GenError)
-TARGET_LINK_LIBRARIES(libmysql wsock32)
+TARGET_LINK_LIBRARIES(libmysql wsock32 ws2_32)
 
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("myTest" "asInvoker")


Attachment: [text/bzr-bundle] bzr/[e-mail]