From: Dyre Tjeldvoll Date: September 20 2012 12:34pm Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4069 to 4072) List-Archive: http://lists.mysql.com/commits/144849 Message-Id: <20120920123407.27253.93324.4072@khepri17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4072 Dyre Tjeldvoll 2012-09-20 Copyright notice for c files modified: storage/ndb/mcc/host_info/config.h.in storage/ndb/mcc/host_info/host_info.c 4071 Dyre Tjeldvoll 2012-09-20 Copyright notice for .py files modified: storage/ndb/mcc/clumodel.py storage/ndb/mcc/clusterhost.py storage/ndb/mcc/config_parser.py storage/ndb/mcc/mkpkg.py* storage/ndb/mcc/remote_clusterhost.py storage/ndb/mcc/request_handler.py storage/ndb/mcc/tst/tst_main.py* storage/ndb/mcc/tst/xmlrunner2.py storage/ndb/mcc/util.py 4070 Dyre Tjeldvoll 2012-09-20 Copyright notice in CMake files modified: storage/ndb/mcc/CMakeLists.txt storage/ndb/mcc/frontend/CMakeLists.txt storage/ndb/mcc/host_info/CMakeLists.txt* 4069 Sivert Sorumgard 2012-09-20 Fix installdir suggested by mcc back end modified: storage/ndb/mcc/clusterhost.py storage/ndb/mcc/ndb_setup.template storage/ndb/mcc/request_handler.py === modified file 'storage/ndb/mcc/CMakeLists.txt' === modified file 'storage/ndb/mcc/CMakeLists.txt' --- a/storage/ndb/mcc/CMakeLists.txt 2012-09-19 18:45:47 +0000 +++ b/storage/ndb/mcc/CMakeLists.txt 2012-09-20 12:15:27 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + macro(SETIFUNDEF_ var val) if(NOT DEFINED ${var}) set(${var} "${val}") === modified file 'storage/ndb/mcc/clumodel.py' --- a/storage/ndb/mcc/clumodel.py 2012-07-09 07:07:31 +0000 +++ b/storage/ndb/mcc/clumodel.py 2012-09-20 12:19:53 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + """ Provides classes that model a cluster and its different node types. """ import time === modified file 'storage/ndb/mcc/clusterhost.py' --- a/storage/ndb/mcc/clusterhost.py 2012-09-20 11:23:51 +0000 +++ b/storage/ndb/mcc/clusterhost.py 2012-09-20 12:19:53 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + """Tools for performing tasks on (possibly remote) Cluster hosts.""" import time === modified file 'storage/ndb/mcc/config_parser.py' --- a/storage/ndb/mcc/config_parser.py 2012-07-09 07:07:31 +0000 +++ b/storage/ndb/mcc/config_parser.py 2012-09-20 12:19:53 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + """ Tools for parsing and extracting information from cluster config.ini files. """ import StringIO import ConfigParser === modified file 'storage/ndb/mcc/frontend/CMakeLists.txt' --- a/storage/ndb/mcc/frontend/CMakeLists.txt 2012-09-18 19:51:09 +0000 +++ b/storage/ndb/mcc/frontend/CMakeLists.txt 2012-09-20 12:15:27 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + INCLUDE("${NDB_SOURCE_DIR}/config/type_mcc_utils.cmake") SET(DOJO_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/dojo.zip") === modified file 'storage/ndb/mcc/host_info/CMakeLists.txt' (properties changed: +x to -x) --- a/storage/ndb/mcc/host_info/CMakeLists.txt 2012-09-19 19:38:18 +0000 +++ b/storage/ndb/mcc/host_info/CMakeLists.txt 2012-09-20 12:15:27 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + macro(ALIAS_IF_UNSET_AND_SYMBOL_EXISTS alias symbol header) if(NOT ${alias}) === modified file 'storage/ndb/mcc/host_info/config.h.in' --- a/storage/ndb/mcc/host_info/config.h.in 2012-08-14 10:31:12 +0000 +++ b/storage/ndb/mcc/host_info/config.h.in 2012-09-20 12:31:32 +0000 @@ -1,6 +1,19 @@ -/* $%BEGINLICENSE%$ - Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. - $%ENDLICENSE%$ */ +/* + Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #cmakedefine HAVE_UNISTD_H #cmakedefine HAVE_WINDOWS_H === modified file 'storage/ndb/mcc/host_info/host_info.c' --- a/storage/ndb/mcc/host_info/host_info.c 2012-08-31 13:36:58 +0000 +++ b/storage/ndb/mcc/host_info/host_info.c 2012-09-20 12:31:32 +0000 @@ -1,3 +1,19 @@ +/* + Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include #define KB 1024 === modified file 'storage/ndb/mcc/mkpkg.py' (properties changed: +x to -x) --- a/storage/ndb/mcc/mkpkg.py 2012-08-08 10:46:55 +0000 +++ b/storage/ndb/mcc/mkpkg.py 2012-09-20 12:19:53 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + #! /usr/bin/env python #"""""" === modified file 'storage/ndb/mcc/remote_clusterhost.py' --- a/storage/ndb/mcc/remote_clusterhost.py 2012-09-19 18:45:15 +0000 +++ b/storage/ndb/mcc/remote_clusterhost.py 2012-09-20 12:19:53 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + import errno import stat import util === modified file 'storage/ndb/mcc/request_handler.py' --- a/storage/ndb/mcc/request_handler.py 2012-09-20 11:23:51 +0000 +++ b/storage/ndb/mcc/request_handler.py 2012-09-20 12:19:53 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + """ The core of the configurator backend. === modified file 'storage/ndb/mcc/tst/tst_main.py' (properties changed: +x to -x) --- a/storage/ndb/mcc/tst/tst_main.py 2012-09-17 13:01:43 +0000 +++ b/storage/ndb/mcc/tst/tst_main.py 2012-09-20 12:19:53 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + #!/bin/env python import platform === modified file 'storage/ndb/mcc/tst/xmlrunner2.py' --- a/storage/ndb/mcc/tst/xmlrunner2.py 2012-08-28 10:30:26 +0000 +++ b/storage/ndb/mcc/tst/xmlrunner2.py 2012-09-20 12:19:53 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + """ XML Test Runner for PyUnit """ === modified file 'storage/ndb/mcc/util.py' --- a/storage/ndb/mcc/util.py 2012-07-20 09:42:31 +0000 +++ b/storage/ndb/mcc/util.py 2012-09-20 12:19:53 +0000 @@ -1,3 +1,18 @@ +# Copyright (c) 2012, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + """ Common utilities needed by the configurator backend modules. """ No bundle (reason: useless for push emails).