Skip to content

Commit

Permalink
Bug#29802548 CLANG-FORMAT NDBCLUSTER PLUGIN SOURCE
Browse files Browse the repository at this point in the history
Mark ndbcluster plugin source as under clang-format in .gitattributes
and run clang-format.

The real committer is Magnus Blåudd <[email protected]>,
but the author has been set to Anonymous Reformatter so that git blame won't
show myself as author of all existing code. To ignore whitespace changes caused
by this commit, please use git blame -w. For ignoring larger changes, you can
run blame on the commit immediately preceding this, as follows:

git blame clang-format-ndbcluster^ -- path/to/file.cc

Change-Id: Ibfd89648b6e2cc390e4f9e389f0f042bc03fa5fa
  • Loading branch information
Anonymous Reformatter authored and blaudden committed Jun 28, 2019
1 parent bae47da commit 771d408
Show file tree
Hide file tree
Showing 113 changed files with 18,674 additions and 26,403 deletions.
11 changes: 9 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,14 @@
/strings/uca_data.h !filter
/internal/meb/meb/mysqloption_list.cpp !filter

# NDB is currently exempt and will be taken in a future merge.
/storage/ndb/** !filter
/sql/abstract_query_plan.h !filter
/sql/abstract_query_plan.cc !filter
# Some NDB source is currently exempt
/storage/ndb/clusterj/** !filter
/storage/ndb/include/** !filter
/storage/ndb/memcache/** !filter
/storage/ndb/ndbapi-examples/** !filter
/storage/ndb/nodejs/** !filter
/storage/ndb/src/** !filter
/storage/ndb/test/** !filter
/storage/ndb/tools/** !filter
34 changes: 0 additions & 34 deletions storage/ndb/.clang-format

This file was deleted.

8 changes: 3 additions & 5 deletions storage/ndb/coding_guidelines.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2017, 2019, 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, version 2.0,
Expand All @@ -21,7 +21,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */

/**
@page CPP_CODING_GUIDELINES_FOR_NDB_SE C++ Coding Guidelines for the NDB Storage Engine
@page CPP_CODING_GUIDELINES_FOR_NDB_SE C++ Coding Guidelines for the NDB
Storage Engine
The mysqld handler part of NDB (ha_ndbcluster.cc,
ha_ndbcluster_binlog.cc, etc.) uses the same coding style as
Expand Down Expand Up @@ -56,7 +57,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
- @subpage USE_OF_NDBREQUIRE
*/


/**
@page BRACES Braces
Expand Down Expand Up @@ -90,7 +90,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
~~~~~~~~~~~~~~~~
*/


/**
@page ASSIGNMENT Assignment
~~~~~~~~~~~~~~~~
Expand All @@ -99,7 +98,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
~~~~~~~~~~~~~~~~
*/


/**
@page USE_OF_NDBREQUIRE Use of ndbrequire
Expand Down
24 changes: 0 additions & 24 deletions storage/ndb/memcache/extra/.clang-format

This file was deleted.

Loading

0 comments on commit 771d408

Please sign in to comment.