bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4004)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0-editline/ based on revid:magnus.blaudd@stripped6

 4004 Magnus Blåudd	2010-11-15
      ndb
       - remove editline/editline.h remnants

    removed:
      storage/ndb/include/editline/
      storage/ndb/include/editline/editline.h
    modified:
      storage/ndb/include/Makefile.am
      storage/ndb/src/kernel/vm/Makefile.am
      storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
=== modified file 'storage/ndb/include/Makefile.am'
--- a/storage/ndb/include/Makefile.am	2010-11-05 12:04:36 +0000
+++ b/storage/ndb/include/Makefile.am	2010-11-15 09:39:07 +0000
@@ -58,6 +58,6 @@ noinst_HEADERS = \
 ndb_global.h \
 ndb_net.h
 
-EXTRA_DIST = debugger editline kernel logger mgmcommon \
+EXTRA_DIST = debugger kernel logger mgmcommon \
 portlib transporter util CMakeLists.txt ndb_config.h.in
 

=== removed directory 'storage/ndb/include/editline'
=== removed file 'storage/ndb/include/editline/editline.h'
--- a/storage/ndb/include/editline/editline.h	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/include/editline/editline.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
-   Copyright (C) 2003 MySQL AB
-    All rights reserved. Use is subject to license terms.
-
-   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
-*/
-
-/* $Id: editline.h,v 1.1 2002/12/11 13:53:46 hin Exp $ */
-
-/*
- * Public include file for editline, to be included instead of readline.h
- */
-
-#ifndef __EDITLINE_H_INCLUDED__
-#define __EDITLINE_H_INCLUDED__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern char	*readline(const char *);
-extern void	add_history(char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !__EDITLINE_H_INCLUDED__ */
-

=== modified file 'storage/ndb/src/kernel/vm/Makefile.am'
--- a/storage/ndb/src/kernel/vm/Makefile.am	2010-09-07 10:04:36 +0000
+++ b/storage/ndb/src/kernel/vm/Makefile.am	2010-11-15 09:39:07 +0000
@@ -14,11 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-#SUBDIRS = testCopy testDataBuffer testSimplePropertiesSection
-#ifneq ($(USE_EDITLINE), N)
-#DIRS += testLongSig
-#endif
-
 noinst_LIBRARIES = libkernel.a libsched.a
 EXTRA_LIBRARIES= libsched_mt.a
 

=== modified file 'storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp'
--- a/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp	2010-11-15 09:39:07 +0000
@@ -19,7 +19,7 @@
 
 #include <ndb_global.h>
 #include <NdbApi.hpp>
-#include <editline/editline.h>
+#include <readline/readline.h>
 #include <../../ndbapi/SignalSender.hpp>
 
 void

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