From: Tor Didriksen
Date: July 23 2010 3:09pm
Subject: bzr commit into mysql-next-mr branch (tor.didriksen:3169)
List-Archive: http://lists.mysql.com/commits/114239
Message-Id: <20100723150929.935E03719@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8973831485562289076=="

--===============8973831485562289076==
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

 3169 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
      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 '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"


--===============8973831485562289076==
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\
#   xq1pud7k14ta07xp
# target_branch: file:///export/home/didrik/repo/next-mr-wl5308-br1/
# testament_sha1: 93c9fef2371453fabf2f7602d43ca2a6c313c11c
# timestamp: 2010-07-23 17:09:29 +0200
# base_revision_id: kevin.lewis@stripped\
#   wab1b12i0wn87w4r
# 
# Begin bundle
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
wA==


--===============8973831485562289076==--