bzr commit into mysql-next-mr branch (tor.didriksen:3168)

[Tor Didriksen]

#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 <gtest/gtest.h>
+
+#include "table_share_builder.h"


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