bzr push into mysql-6.0 branch (serg:2753 to 2754)

[Sergei Golubchik]

 2754 Sergei Golubchik	2009-05-04
      added new files to the appropriate Makefile.am's and CMakeLists.txt's

    added:
      libservices/CMakeLists.txt
    modified:
      CMakeLists.txt
      include/Makefile.am
      libservices/Makefile.am
      sql/CMakeLists.txt
      sql/Makefile.am
 2753 Sergei Golubchik	2009-05-04
      include mysql/plugin.h early for the server to see it,
      make sure LEX_STRING is defined in one place only
     @ include/mysql/plugin.h
        relying on SHOW_FUNC being the last didn't work :)
     @ include/mysql/plugin.h.pp
        update (the version isn't increased as only storage engines are affected)
     @ include/mysql/service_my_snprintf.h
        include stdlib.h for size_t
     @ include/mysql/service_thd_alloc.h
        fix the type to be compatible with the server
        (alas, comments "thsi definition must match..." don't work)
        include stdlib.h for size_t
     @ sql/mysql_priv.h
        this redefine has to be done before mysql/plugin.h is included
     @ sql/sql_plugin.h
        moved to mysql_priv.h
     @ sql/transaction.cc
        include mysql_priv.h first

    modified:
      include/m_string.h
      include/mysql/plugin.h
      include/mysql/plugin.h.pp
      include/mysql/service_my_snprintf.h
      include/mysql/service_thd_alloc.h
      mysys/my_getopt.c
      sql/mysql_priv.h
      sql/sql_plugin.h
      sql/transaction.cc
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2009-04-15 23:38:47 +0000
+++ b/CMakeLists.txt	2009-05-04 20:51:05 +0000
@@ -318,6 +318,7 @@ ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(client)
 ADD_SUBDIRECTORY(sql)
 ADD_SUBDIRECTORY(libmysql)
+ADD_SUBDIRECTORY(libservices)
 ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(unittest/mytap)
 ADD_SUBDIRECTORY(unittest/examples)

=== modified file 'include/Makefile.am'
--- a/include/Makefile.am	2009-04-25 21:20:45 +0000
+++ b/include/Makefile.am	2009-05-04 20:51:05 +0000
@@ -23,6 +23,7 @@ HEADERS_ABI =		mysql.h mysql_com.h mysql
 			mysql/plugin_audit.h mysql/plugin_ftparser.h
 pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
 			my_xml.h mysql_embed.h mysql/services.h \
+			mysql/service_my_snprintf.h mysql/service_thd_alloc.h \
 		  	my_pthread.h my_no_pthread.h \
 			decimal.h errmsg.h my_global.h my_net.h \
 			my_getopt.h sslopt-longopts.h my_dir.h \

=== added file 'libservices/CMakeLists.txt'
--- a/libservices/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ b/libservices/CMakeLists.txt	2009-05-04 20:51:05 +0000
@@ -0,0 +1,20 @@
+# Copyright (C) 2006 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+
+SET(LIBSERVICES_SOURCES my_snprintf_service.c thd_alloc_service.c)
+
+ADD_LIBRARY(strings ${STRINGS_SOURCES})

=== modified file 'libservices/Makefile.am'
--- a/libservices/Makefile.am	2009-04-25 21:20:45 +0000
+++ b/libservices/Makefile.am	2009-05-04 20:51:05 +0000
@@ -13,6 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+AM_CPPFLAGS =		-I$(top_srcdir)/include
 pkglib_LIBRARIES =	libmysqlservices.a
-libmysqlservices_a_SOURCES =  my_snprintf_service.c
+libmysqlservices_a_SOURCES =  my_snprintf_service.c thd_alloc_service.c
 

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2009-04-20 17:08:21 +0000
+++ b/sql/CMakeLists.txt	2009-05-04 20:51:05 +0000
@@ -47,7 +47,7 @@ SET (SQL_SOURCE
                ../sql-common/client.c derror.cc des_key_file.cc
                discover.cc ../libmysql/errmsg.c field.cc field_conv.cc
                filesort.cc gstream.cc sha2.cc ha_partition.cc
-               handler.cc hash_filo.cc hash_filo.h 
+               handler.cc hash_filo.cc hash_filo.h sql_plugin_services.h
                hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc 
                item_create.cc item_func.cc item_geofunc.cc item_row.cc 
                item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc 

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2009-05-04 15:51:55 +0000
+++ b/sql/Makefile.am	2009-05-04 20:51:05 +0000
@@ -69,7 +69,7 @@ mysqld_LDADD =		libndb.la \
 
 noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			item_strfunc.h item_timefunc.h \
-			item_xmlfunc.h \
+			item_xmlfunc.h sql_plugin_services.h \
 			item_create.h item_subselect.h item_row.h \
 			mysql_priv.h item_geofunc.h sql_bitmap.h \
 			procedure.h sql_class.h sql_lex.h sql_list.h \


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