X-Account-Key: account4 X-UIDL: 1153746480.180776 X-Mozilla-Status: 0001 X-Mozilla-Status2: 00000000 X-Mozilla-Keys: Return-Path: Received: from mailget.mysql.com ([unix socket]) by mailget (Cyrus v2.3.1-Invoca-RPM-2.3.1-2.8.fc5) with LMTPA; Wed, 23 Jul 2008 02:29:50 +0200 X-Sieve: CMU Sieve 2.3 Received: from mail.mysql.com (mail.mysql.com [10.100.1.21]) by mailget.mysql.com (8.13.8/8.13.8) with ESMTP id m6N0ToRC010923 for ; Wed, 23 Jul 2008 02:29:50 +0200 Received: from mailgate-b.mysql.com (mailgate-b.mysql.com [10.128.18.33]) by mail.mysql.com (8.13.3/8.13.3) with ESMTP id m6N0To8h011058 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 23 Jul 2008 02:29:50 +0200 Received: from lists.mysql.com (lists.mysql.com [10.100.1.37]) by mailgate-b.mysql.com (8.13.8/8.13.8) with SMTP id m6N0Tn8i014915 for ; Wed, 23 Jul 2008 02:29:49 +0200 Received: (qmail 24918 invoked by uid 510); 23 Jul 2008 00:29:48 -0000 Mailing-List: contact commits-help@lists.mysql.com; run by ezmlm List-ID: Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Archive: http://lists.mysql.com/commits/50240 Delivered-To: mailing list commits@lists.mysql.com Received: (qmail 24893 invoked by uid 509); 23 Jul 2008 00:29:48 -0000 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Marc Alff Subject: bzr commit into mysql-6.0-wl2110-review branch (marc.alff:2675) WL#2110 To: commits@lists.mysql.com User-Agent: Bazaar (1.4) X-CSetKey: marc.alff@sun.com-20080723002935-ifptqct725apu129 X-Worklog: 2110 X-bzr-action: commit X-bzr-revid: marc.alff@sun.com-20080723002935-ifptqct725apu129 X-bzr-revno: 2675 Message-Id: <20080723002940.9E49B2DCAB@lambda.WEBLAB> Date: Tue, 22 Jul 2008 18:29:40 -0600 (MDT) X-Cxn-Txn: 56108165,34985494 #At file:///home/malff/BZR-TREE/mysql-6.0-wl2110-review-part9/ 2675 Marc Alff 2008-07-22 WL#2110 (Stored Procedures: Implement SIGNAL) Formal review part 9/10: Makefiles This patch adjusts Makefiles. modified: libmysqld/CMakeLists.txt libmysqld/Makefile.am sql/CMakeLists.txt sql/Makefile.am === modified file 'libmysqld/CMakeLists.txt' --- a/libmysqld/CMakeLists.txt 2008-07-09 07:12:43 +0000 +++ b/libmysqld/CMakeLists.txt 2008-07-23 00:29:35 +0000 @@ -203,6 +203,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libm ../sql/scheduler.cc ../sql/sql_audit.cc ../sql/ddl_blocker.cc ../sql/si_objects.cc ../sql/event_parse_data.cc ../sql/mdl.cc + ../sql/sql_signal.cc ../sql/sql_fixstring.cc ${GEN_SOURCES} ${LIB_SOURCES}) === modified file 'libmysqld/Makefile.am' --- a/libmysqld/Makefile.am 2008-07-09 07:12:43 +0000 +++ b/libmysqld/Makefile.am 2008-07-23 00:29:35 +0000 @@ -82,7 +82,7 @@ sqlsources = derror.cc field.cc field_co sql_tablespace.cc \ rpl_injector.cc my_user.c partition_info.cc \ sql_servers.cc ddl_blocker.cc si_objects.cc sql_audit.cc \ - event_parse_data.cc mdl.cc + event_parse_data.cc mdl.cc sql_signal.cc sql_fixstring.cc libmysqld_int_a_SOURCES= $(libmysqld_sources) nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources) === modified file 'sql/CMakeLists.txt' --- a/sql/CMakeLists.txt 2008-07-09 07:12:43 +0000 +++ b/sql/CMakeLists.txt 2008-07-23 00:29:35 +0000 @@ -78,6 +78,7 @@ ADD_EXECUTABLE(mysqld sql_connect.cc scheduler.cc ddl_blocker.cc si_objects.cc sql_profile.cc event_parse_data.cc mdl.cc + sql_signal.cc sql_fixstring.cc ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h ${PROJECT_SOURCE_DIR}/include/mysqld_error.h === modified file 'sql/Makefile.am' --- a/sql/Makefile.am 2008-07-09 07:12:43 +0000 +++ b/sql/Makefile.am 2008-07-23 00:29:35 +0000 @@ -62,7 +62,7 @@ noinst_HEADERS = item.h item_func.h item 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 \ - sql_map.h sql_string.h unireg.h \ + sql_map.h sql_string.h sql_fixstring.h unireg.h \ sql_error.h field.h handler.h mysqld_suffix.h \ sql_profile.h \ ha_ndbcluster.h ha_ndbcluster_cond.h \ @@ -89,7 +89,8 @@ noinst_HEADERS = item.h item_func.h item sql_partition.h partition_info.h partition_element.h \ probes.h sql_audit.h \ contributors.h sql_servers.h ddl_blocker.h \ - si_objects.h sql_plist.h mdl.h + si_objects.h sql_plist.h mdl.h \ + sql_signal.h sql_fixstring.h mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ @@ -136,7 +137,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler. sql_builtin.cc sql_tablespace.cc partition_info.cc \ sql_servers.cc sql_audit.cc sha2.cc \ ddl_blocker.cc si_objects.cc event_parse_data.cc \ - mdl.cc + mdl.cc sql_signal.cc sql_fixstring.cc if HAVE_DTRACE mysqld_SOURCES += probes.d -- MySQL Code Commits Mailing List For list archives: http://lists.mysql.com/commits To unsubscribe: http://lists.mysql.com/commits?unsub=marc.alff@mysql.com