MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Hakan Kuecuekyilmaz Date:September 30 2007 9:11pm
Subject:bk commit into 6.0 tree (hakank:1.2607) BUG#31267
View as plain text  
Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-30 23:11:05+02:00, hakank@stripped +4 -0
  Fix for Bug#31267.

  BUILD/compile-dist@stripped, 2007-09-30 23:11:00+02:00, hakank@stripped +2 -3
    Removed no more needed storage/innobase line.
    Added Falcon.

  storage/falcon/Makefile.am@stripped, 2007-09-30 23:11:00+02:00, hakank@stripped +6 -6
    Fix for Bug#31267. Thanks to Kent for helping out with this one.
    Also white space clean up.

  storage/falcon/TransformLib/Makefile.am@stripped, 2007-09-30 23:11:01+02:00, hakank@stripped +3 -3
    White space clean up.

  storage/falcon/plug.in@stripped, 2007-09-30 23:11:01+02:00, hakank@stripped +9 -9
    White space clean up.

diff -Nrup a/BUILD/compile-dist b/BUILD/compile-dist
--- a/BUILD/compile-dist	2007-01-28 21:09:50 +01:00
+++ b/BUILD/compile-dist	2007-09-30 23:11:00 +02:00
@@ -7,9 +7,7 @@
 # package" that is used as the basis for all other binary builds.
 #
 test -f Makefile && make maintainer-clean
-(cd storage/innobase && aclocal && autoheader && \
-    libtoolize --automake --force --copy && \
-    automake --force --add-missing --copy && autoconf)
+
 aclocal
 autoheader
 libtoolize --automake --force --copy
@@ -50,6 +48,7 @@ fi
   --with-blackhole-storage-engine \
   --with-csv-storage-engine \
   --with-example-storage-engine \
+  --with-falcon \
   --with-federated-storage-engine \
   --with-innodb \
   --with-ssl \
diff -Nrup a/storage/falcon/Makefile.am b/storage/falcon/Makefile.am
--- a/storage/falcon/Makefile.am	2007-09-25 07:14:41 +02:00
+++ b/storage/falcon/Makefile.am	2007-09-30 23:11:00 +02:00
@@ -1,14 +1,14 @@
-# Copyright (C) 2006 MySQL AB
-# 
+# Copyright (C) 2006, 2007 MySQL AB
+#
 # 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
@@ -19,7 +19,7 @@ SUBDIRS= TransformLib
 CXXFLAGS= @CXXFLAGS@ -fimplicit-templates @FALCON_CXXFLAGS@
 
 DEFS= @DEFS@ \
-      -D_REENTRANT -D_PTHREADS -DENGINE -DSTORAGE_ENGINE -DNAMESPACE=Nfs 
+      -D_REENTRANT -D_PTHREADS -DENGINE -DSTORAGE_ENGINE -DNAMESPACE=Nfs
 
 INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \
 	  -I$(top_srcdir)/regex -I$(top_srcdir)/sql \
@@ -344,7 +344,7 @@ ha_falcon_la_SOURCES=	$(falcon_sources)
 EXTRA_LIBRARIES=	libfalcon.a libhafalcon.a
 noinst_LIBRARIES=	@plugin_falcon_static_target@
 libfalcon_a_LIBADD=	libhafalcon.a TransformLib/libtransform.a
-libfalcon_a_SOURCES=	libhafalcon.a
+libfalcon_a_SOURCES=
 libhafalcon_a_CXXFLAGS=	$(AM_CXXFLAGS)
 libhafalcon_a_CFLAGS=	$(AM_CFLAGS)
 libhafalcon_a_SOURCES=	$(falcon_sources)
diff -Nrup a/storage/falcon/TransformLib/Makefile.am b/storage/falcon/TransformLib/Makefile.am
--- a/storage/falcon/TransformLib/Makefile.am	2007-09-20 17:42:53 +02:00
+++ b/storage/falcon/TransformLib/Makefile.am	2007-09-30 23:11:01 +02:00
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 MySQL AB
+# Copyright (C) 2006, 2007 MySQL AB
 #
 # 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
@@ -22,7 +22,7 @@ transform_sources=	 Base64Transform.cpp 
 			 FileTransform.cpp HexTransform.cpp NullTransform.cpp \
 			 SHATransform.cpp StreamTransform.cpp \
 			 StringTransform.cpp TransformException.cpp \
-			 TransformUtil.cpp 
+			 TransformUtil.cpp
 
 transform_headers=	 Base64Transform.h BERDecode.h BEREncode.h \
 			 BERItem.h BERObject.h \
@@ -31,7 +31,7 @@ transform_headers=	 Base64Transform.h BE
 			 EncryptTransform.h FileTransform.h HexTransform.h \
 			 NullTransform.h SHATransform.h \
 			 StreamTransform.h StringTransform.h \
-			 TransformException.h Transform.h TransformUtil.h 
+			 TransformException.h Transform.h TransformUtil.h
 
 noinst_LTLIBRARIES=	 libtransform.la
 noinst_LIBRARIES=	 libtransform.a
diff -Nrup a/storage/falcon/plug.in b/storage/falcon/plug.in
--- a/storage/falcon/plug.in	2007-09-28 01:39:20 +02:00
+++ b/storage/falcon/plug.in	2007-09-30 23:11:01 +02:00
@@ -1,10 +1,10 @@
 MYSQL_STORAGE_ENGINE(falcon, falcon, [Falcon Storage Engine],
         [Transactional tables using Falcon], [max,max-no-ndb])
 MYSQL_PLUGIN_DIRECTORY(falcon, [storage/falcon])
-MYSQL_PLUGIN_STATIC(falcon,   [libfalcon.a])
-MYSQL_PLUGIN_DYNAMIC(falcon,  [ha_falcon.la])
-#
+MYSQL_PLUGIN_STATIC(falcon,    [libfalcon.a])
+MYSQL_PLUGIN_DYNAMIC(falcon,   [ha_falcon.la])
 
+# Check for supported machine types.
 AC_CACHE_CHECK([if Falcon Storage Engine is supported on $MACHINE_TYPE],
   			   falcon_supported_by_machine,[
   case "$BASE_MACHINE_TYPE" in
@@ -15,11 +15,11 @@ AC_CACHE_CHECK([if Falcon Storage Engine
 ])
 
 if test "$falcon_supported_by_machine" != "yes"; then
-  mysql_plugin_falcon="no"	
-  with_plugin_falcon="no"	
+  mysql_plugin_falcon="no"
+  with_plugin_falcon="no"
 fi
 
-# Generate Makefile for TransformLib
+# Generate Makefile for TransformLib.
 MYSQL_PLUGIN_ACTIONS(falcon,[
   AC_CONFIG_FILES(storage/falcon/TransformLib/Makefile)
 
@@ -30,15 +30,15 @@ MYSQL_PLUGIN_ACTIONS(falcon,[
     CXXFLAGS="$CXXFLAGS -Wno-invalid-offsetof"
     AC_TRY_COMPILE([],
       [int i = 0;
-       i++;], 
-      falcon_cxx_no_invalid_offsetof="-Wno-invalid-offsetof", 
+       i++;],
+      falcon_cxx_no_invalid_offsetof="-Wno-invalid-offsetof",
       falcon_cxx_no_invalid_offsetof=""
     )
     CXXFLAGS=$ac_save_CXXFLAGS
     AC_LANG_POP([C++])
   ])
 
-  # Falcon uses exceptions and STL
+  # Falcon uses exceptions and STL.
   CXXLDFLAGS="$CXXLDFLAGS -lstdc++"
   FALCON_CXXFLAGS="$falcon_cxx_no_invalid_offsetof -fexceptions"
   case "$with_debug" in
Thread
bk commit into 6.0 tree (hakank:1.2607) BUG#31267Hakan Kuecuekyilmaz30 Sep