• calvin's avatar
    branches/5.1: · 06db0143
    calvin authored
    Merge PART OF r2911.5.5 from MySQL:
    
    adjust CMakeLists.txt to work with MySQL 5.1.38
    and beyond.
    
    MySQL changed how the build works on Windows starting from 5.1.38.
    All shared properties are defined in mysql_storage_engine.cmake.
    And the top level CMakeLists.txt determines what engines to build
    and how (static vs. dynamic).
    
    log message from BZR:
    
      ------------------------------------------------------------
      revno: 2911.5.5
      committer: Vladislav Vaintroub <vvaintroub@mysql.com>
      branch nick: 5.1-innodb_plugin
      timestamp: Wed 2009-06-10 10:59:49 +0200
      message:
        Backport WL#3653 to 5.1 to enable bundled innodb plugin.
        Remove custom DLL loader code from innodb plugin code, use 
        symbols exported from mysqld.
      removed:
        storage/innodb_plugin/handler/handler0vars.h
        storage/innodb_plugin/handler/win_delay_loader.cc
      added:
        storage/mysql_storage_engine.cmake
        win/create_def_file.js
      modified:
        CMakeLists.txt
        include/m_ctype.h
        include/my_global.h
        include/my_sys.h
        include/mysql/plugin.h
        libmysqld/CMakeLists.txt
        mysql-test/mysql-test-run.pl
        mysql-test/t/plugin.test
        mysql-test/t/plugin_load-master.opt
        mysys/charset.c
        sql/CMakeLists.txt
        sql/handler.h
        sql/mysql_priv.h
        sql/mysqld.cc
        sql/sql_class.cc
        sql/sql_class.h
        sql/sql_list.h
        sql/sql_profile.h
        storage/Makefile.am
        storage/archive/CMakeLists.txt
        storage/blackhole/CMakeLists.txt
        storage/csv/CMakeLists.txt
        storage/example/CMakeLists.txt
        storage/federated/CMakeLists.txt
        storage/heap/CMakeLists.txt
        storage/innobase/CMakeLists.txt
        storage/innobase/handler/ha_innodb.cc
        storage/innodb_plugin/CMakeLists.txt
        storage/innodb_plugin/handler/ha_innodb.cc
        storage/innodb_plugin/handler/handler0alter.cc
        storage/innodb_plugin/handler/i_s.cc
        storage/innodb_plugin/plug.in
        storage/myisam/CMakeLists.txt
        storage/myisammrg/CMakeLists.txt
        win/Makefile.am
        win/configure.js
    06db0143
CMakeLists.txt 3.04 KB