From: Tor Didriksen Date: July 23 2010 2:56pm Subject: bzr commit into mysql-next-mr branch (tor.didriksen:3168) List-Archive: http://lists.mysql.com/commits/114234 Message-Id: <20100723145602.0DDF93719@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7018348476565382971==" --===============7018348476565382971== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/next-mr-wl5308-br1/ based on revid:kevin.lewis@stripped 3168 Tor Didriksen 2010-07-23 Make table_share_builder compile standalone added: unittest/gunit/table_share_builder-t.cc modified: sql/table_share_builder.cc sql/table_share_builder.h storage/archive/ha_archive.cc unittest/gunit/CMakeLists.txt === modified file 'sql/table_share_builder.cc' --- a/sql/table_share_builder.cc 2010-07-23 14:20:16 +0000 +++ b/sql/table_share_builder.cc 2010-07-23 14:55:58 +0000 @@ -33,7 +33,7 @@ #include "my_global.h" #include "sql_base.h" -#include "Table_share_builder.h" +#include "table_share_builder.h" Table_share_builder::Table_share_builder() === modified file 'sql/table_share_builder.h' --- a/sql/table_share_builder.h 2010-07-23 14:20:16 +0000 +++ b/sql/table_share_builder.h 2010-07-23 14:55:58 +0000 @@ -18,6 +18,12 @@ #ifndef TABLE_SHARE_BUILDER_H #define TABLE_SHARE_BUILDER_H +#include "my_global.h" +#include "mysql_com.h" +#include "my_base.h" +#include "my_alloc.h" +#include "key.h" + /** @file sql/table_share_builder.h @brief Class for building a TABLE_SHARE and adding it to table_def_cache. @@ -35,6 +41,10 @@ ::finalize() */ +struct handlerton; +struct TABLE_SHARE; +class Field; + // This define is used in 6.0 with MariaDB, using MyISAM define for now. #define ENGINE_UNIQUE_HASH_LENGTH MI_UNIQUE_HASH_LENGTH === modified file 'storage/archive/ha_archive.cc' --- a/storage/archive/ha_archive.cc 2010-05-28 05:48:10 +0000 +++ b/storage/archive/ha_archive.cc 2010-07-23 14:55:58 +0000 @@ -195,7 +195,7 @@ int archive_db_init(void *p) archive_hton->db_type= DB_TYPE_ARCHIVE_DB; archive_hton->create= archive_create_handler; archive_hton->flags= HTON_NO_FLAGS; - archive_hton->discover= archive_discover; + archive_hton->discover_frm= archive_discover; if (mysql_mutex_init(az_key_mutex_archive_mutex, &archive_mutex, MY_MUTEX_INIT_FAST)) === modified file 'unittest/gunit/CMakeLists.txt' --- a/unittest/gunit/CMakeLists.txt 2010-06-18 09:09:40 +0000 +++ b/unittest/gunit/CMakeLists.txt 2010-07-23 14:55:58 +0000 @@ -206,7 +206,7 @@ IF (CMAKE_CXX_COMPILER_ID STREQUAL "SunP ENDIF() # Add tests (link them with sql library) -SET(TESTS sql_list mdl mdl_mytap thread_utils) +SET(TESTS sql_list mdl mdl_mytap table_share_builder thread_utils) FOREACH(test ${TESTS}) ADD_EXECUTABLE(${test}-t ${test}-t.cc) TARGET_LINK_LIBRARIES(${test}-t gunit sql) === added file 'unittest/gunit/table_share_builder-t.cc' --- a/unittest/gunit/table_share_builder-t.cc 1970-01-01 00:00:00 +0000 +++ b/unittest/gunit/table_share_builder-t.cc 2010-07-23 14:55:58 +0000 @@ -0,0 +1,20 @@ +/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +// Must include gtest first, since MySQL source has macros for min() etc .... +#include + +#include "table_share_builder.h" --===============7018348476565382971== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # qbjim7jnb0jg0bz4 # target_branch: file:///export/home/didrik/repo/next-mr-wl5308-br1/ # testament_sha1: 21f6498bd072770bd02b86b05d224ce42e4ce6d8 # timestamp: 2010-07-23 16:56:01 +0200 # base_revision_id: kevin.lewis@stripped\ # gea21q639zkpvty3 # # Begin bundle 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 --===============7018348476565382971==--