diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-04 13:25:19 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-04 13:25:19 +0200 |
| commit | b57e4dbd88671df86e2cf39aff5178976d710b64 (patch) | |
| tree | 32be2bfec3ca062c65566c60ecf59b673d1f97e9 /storage/archive | |
| parent | 1a0c2153a036296785dcdfa7b5f4974515616e11 (diff) | |
| parent | 94efc1c6b084ed531b513e70fb66e7b7a1186b56 (diff) | |
| download | mariadb-git-b57e4dbd88671df86e2cf39aff5178976d710b64.tar.gz | |
Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:
bzr branch mysql-5.1-performance-version mysql-trunk # Summit
cd mysql-trunk
bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin
bzr rm innobase # remove the builtin
Next step: build, test fixes.
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | storage/archive/ha_archive.cc | 4 |
2 files changed, 4 insertions, 15 deletions
diff --git a/storage/archive/CMakeLists.txt b/storage/archive/CMakeLists.txt index 1c53ad15c07..ce4d92d3f99 100644 --- a/storage/archive/CMakeLists.txt +++ b/storage/archive/CMakeLists.txt @@ -13,17 +13,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") - -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib - ${CMAKE_SOURCE_DIR}/sql - ${CMAKE_SOURCE_DIR}/regex - ${CMAKE_SOURCE_DIR}/extra/yassl/include) - +INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") SET(ARCHIVE_SOURCES azio.c ha_archive.cc ha_archive.h) - -IF(NOT SOURCE_SUBLIBS) - ADD_LIBRARY(archive ${ARCHIVE_SOURCES}) - ADD_DEPENDENCIES(archive GenError) -ENDIF(NOT SOURCE_SUBLIBS) +MYSQL_STORAGE_ENGINE(ARCHIVE) diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 46e9a99c446..7f7f3534a22 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1497,8 +1497,8 @@ int ha_archive::info(uint flag) stats.mean_rec_length= table->s->reclength + buffer.alloced_length(); stats.data_file_length= file_stat.st_size; - stats.create_time= file_stat.st_ctime; - stats.update_time= file_stat.st_mtime; + stats.create_time= (ulong) file_stat.st_ctime; + stats.update_time= (ulong) file_stat.st_mtime; stats.max_data_file_length= share->rows_recorded * stats.mean_rec_length; } stats.delete_length= 0; |