Bug #27414321: CLANG-FORMAT EVERYTHING

Mark nearly all C/C++ code as under clang-format in .gitattributes,
and run clang-format over the entire code base.

The real committer is Steinar H. Gunderson <[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-base^ -- path/to/file.cc

Author: Anonymous Reformatter

.gitattributes

@@ -1,8 +1,41 @@
 .gitattributes export-ignore
 .gitignore export-ignore
-/sql/gis/*.cc filter=codeformat
-/sql/gis/*.h filter=codeformat
-/sql/gis/srs/*.cc filter=codeformat
-/sql/gis/srs/*.h filter=codeformat
-/include/my_alloc.h filter=codeformat
-/mysys/my_alloc.cc filter=codeformat
+
+# All MySQL code is auto-formatted using clang-format.
+*.c filter=codeformat
+*.cc filter=codeformat
+*.cpp filter=codeformat
+*.h filter=codeformat
+*.hpp filter=codeformat
+*.i filter=codeformat
+*.ic filter=codeformat
+
+# Third-party code.
+/extra/** !filter
+/include/boost_*/** !filter
+/plugin/innodb_memcached/daemon_memcached/** !filter
+/plugin/innodb_memcached/innodb_memcache/cache-src/** !filter
+/internal/plugin/keyring_okv/okv_client_sdk/** !filter
+/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/** !filter
+
+# Generated from lex/yacc.
+/storage/innobase/fts/fts0blex.cc !filter
+/storage/innobase/fts/fts0pars.cc !filter
+/storage/innobase/fts/fts0tlex.cc !filter
+/storage/innobase/include/fts0blex.h !filter
+/storage/innobase/include/fts0pars.h !filter
+/storage/innobase/include/fts0tlex.h !filter
+/storage/innobase/pars/lexyy.cc !filter
+/storage/innobase/pars/pars0grm.cc !filter
+
+# Other autogenerated files. The generators should eventually be updated.
+/strings/uca900_data.h !filter
+/strings/uca900_ja_data.h !filter
+/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/*ndb* !filter
+/sql/abstract_query_plan.h !filter
+/sql/abstract_query_plan.cc !filter

client/base/abstract_connection_program.cc

@@ -26,24 +26,19 @@
 
 using namespace Mysql::Tools::Base;
 
-
 Abstract_connection_program::Abstract_connection_program()
-  : m_connection_options(this)
-{
+    : m_connection_options(this) {
   this->add_provider(&this->m_connection_options);
 }
 
-MYSQL* Abstract_connection_program::create_connection()
-{
+MYSQL *Abstract_connection_program::create_connection() {
   return this->m_connection_options.create_connection();
 }
 
-CHARSET_INFO* Abstract_connection_program::get_current_charset() const
-{
+CHARSET_INFO *Abstract_connection_program::get_current_charset() const {
   return m_connection_options.get_current_charset();
 }
 
-void Abstract_connection_program::set_current_charset(CHARSET_INFO* charset)
-{
+void Abstract_connection_program::set_current_charset(CHARSET_INFO *charset) {
   m_connection_options.set_current_charset(charset);
 }

client/base/abstract_connection_program.h

@@ -34,43 +34,42 @@
 #include "client/base/mysql_connection_options.h"
 #include "client/client_priv.h"
 
-namespace Mysql{
-namespace Tools{
-namespace Base{
+namespace Mysql {
+namespace Tools {
+namespace Base {
 
 /**
   Base class for all programs that use connection to MySQL database server.
  */
-class Abstract_connection_program
-  : public Abstract_program, public I_connection_factory
-{
-public:
+class Abstract_connection_program : public Abstract_program,
+                                    public I_connection_factory {
+ public:
   /**
     Provides new connection to MySQL database server based on option values.
     Implementation of I_connection_factory interface.
    */
-  virtual MYSQL* create_connection();
+  virtual MYSQL *create_connection();
 
   /**
     Retrieves charset that will be used in new MySQL connections. Can be NULL
     if none was set explicitly.
    */
-  CHARSET_INFO* get_current_charset() const;
+  CHARSET_INFO *get_current_charset() const;
 
   /**
     Sets charset that will be used in new MySQL connections.
    */
-  void set_current_charset(CHARSET_INFO* charset);
+  void set_current_charset(CHARSET_INFO *charset);
 
-protected:
+ protected:
   Abstract_connection_program();
 
-private:
+ private:
   Options::Mysql_connection_options m_connection_options;
 };
 
-}
-}
-}
+}  // namespace Base
+}  // namespace Tools
+}  // namespace Mysql
 
 #endif

client/base/abstract_enum_option.h

@@ -29,18 +29,17 @@
 
 #include "client/base/abstract_option.h"
 
-namespace Mysql{
-namespace Tools{
-namespace Base{
-namespace Options{
+namespace Mysql {
+namespace Tools {
+namespace Base {
+namespace Options {
 
 /**
   Abstract option to handle enum option values.
  */
-template<typename T_type, typename T_typelib> class Abstract_enum_option
-  : public Abstract_option<T_type>
-{
-protected:
+template <typename T_type, typename T_typelib>
+class Abstract_enum_option : public Abstract_option<T_type> {
+ protected:
   /**
     Constructs new enum option.
     @param value Pointer to object to receive option value.
@@ -52,24 +51,23 @@ template<typename T_type, typename T_typelib> class Abstract_enum_option
     @param default_value default value to be supplied to internal option
       data structure.
    */
-  Abstract_enum_option(T_type* value, const T_typelib* type, ulong var_type,
-    std::string name, std::string description, longlong default_value);
+  Abstract_enum_option(T_type *value, const T_typelib *type, ulong var_type,
+                       std::string name, std::string description,
+                       longlong default_value);
 };
 
-
-template<typename T_type, typename T_typelib>Abstract_enum_option<T_type, T_typelib>
-::Abstract_enum_option(
-  T_type* value, const T_typelib* type, ulong var_type, std::string name,
-  std::string description, longlong default_value)
-  : Abstract_option<T_type>(
-      value, var_type, name, description, default_value)
-{
-  this->m_option_structure.typelib= const_cast<T_typelib*>(type);
+template <typename T_type, typename T_typelib>
+Abstract_enum_option<T_type, T_typelib>::Abstract_enum_option(
+    T_type *value, const T_typelib *type, ulong var_type, std::string name,
+    std::string description, longlong default_value)
+    : Abstract_option<T_type>(value, var_type, name, description,
+                              default_value) {
+  this->m_option_structure.typelib = const_cast<T_typelib *>(type);
 }
 
-}
-}
-}
-}
+}  // namespace Options
+}  // namespace Base
+}  // namespace Tools
+}  // namespace Mysql
 
 #endif

client/base/abstract_integer_number_option.h

@@ -29,42 +29,42 @@
 
 #include "client/base/abstract_number_option.h"
 
-namespace Mysql{
-namespace Tools{
-namespace Base{
-namespace Options{
+namespace Mysql {
+namespace Tools {
+namespace Base {
+namespace Options {
 
 /**
   Abstract option to handle integer number option values.
  */
-template<typename T_type, typename T_value> class Abstract_integer_number_option
-  : public Abstract_number_option<T_type, T_value>
-{
-public:
+template <typename T_type, typename T_value>
+class Abstract_integer_number_option
+    : public Abstract_number_option<T_type, T_value> {
+ public:
   /**
     Sets value for this option. If it is specified before handling commandline
     options then supplied value is used as default value of this option.
    */
-  T_type* set_value(T_value value);
+  T_type *set_value(T_value value);
 
   /**
     Sets required divisor of input value.
    */
-  T_type* set_value_step(T_value step);
+  T_type *set_value_step(T_value step);
   /**
     Sets minimum value boundary for option value. Smaller values passed as
     option value will be changed to this minimum value.
     Part of implementation of Abstract_number_option virtual method.
    */
-  virtual T_type* set_minimum_value(T_value minimum);
+  virtual T_type *set_minimum_value(T_value minimum);
   /**
     Sets maximum value boundary for option value. Greater values passed as
     option value will be changed to this maximum value.
     Part of implementation of Abstract_number_option virtual method.
    */
-  virtual T_type* set_maximum_value(T_value maximum);
+  virtual T_type *set_maximum_value(T_value maximum);
 
-protected:
+ protected:
   /**
     Constructs new number option.
     @param value Pointer to object to receive option value.
@@ -73,58 +73,50 @@ template<typename T_type, typename T_value> class Abstract_integer_number_option
       --name.
     @param description Description of option to be printed in --help.
    */
-  Abstract_integer_number_option(
-    T_value* value, ulong var_type, std::string name, std::string description);
+  Abstract_integer_number_option(T_value *value, ulong var_type,
+                                 std::string name, std::string description);
 };
 
-template<typename T_type, typename T_value>
-  Abstract_integer_number_option<T_type, T_value>::
-    Abstract_integer_number_option(
-      T_value* value, ulong var_type, std::string name,
-      std::string description)
-  : Abstract_number_option<T_type, T_value>(
-      value, var_type, name, description, 0)
-{
-  *value= 0;
+template <typename T_type, typename T_value>
+Abstract_integer_number_option<T_type, T_value>::Abstract_integer_number_option(
+    T_value *value, ulong var_type, std::string name, std::string description)
+    : Abstract_number_option<T_type, T_value>(value, var_type, name,
+                                              description, 0) {
+  *value = 0;
 }
 
-template<typename T_type, typename T_value>
-  T_type* Abstract_integer_number_option<T_type, T_value>::
-    set_value(T_value value)
-{
-  *(T_value*)this->m_option_structure.value= value;
-  this->m_option_structure.def_value= (longlong)value;
-  return (T_type*)this;
+template <typename T_type, typename T_value>
+T_type *Abstract_integer_number_option<T_type, T_value>::set_value(
+    T_value value) {
+  *(T_value *)this->m_option_structure.value = value;
+  this->m_option_structure.def_value = (longlong)value;
+  return (T_type *)this;
 }
 
-template<typename T_type, typename T_value>
-  T_type* Abstract_integer_number_option<T_type, T_value>::
-    set_value_step(T_value step)
-{
-  this->m_option_structure.block_size= (long)step;
-  return (T_type*)this;
+template <typename T_type, typename T_value>
+T_type *Abstract_integer_number_option<T_type, T_value>::set_value_step(
+    T_value step) {
+  this->m_option_structure.block_size = (long)step;
+  return (T_type *)this;
 }
 
-template<typename T_type, typename T_value>
-  T_type* Abstract_integer_number_option<T_type, T_value>::
-    set_minimum_value(T_value minimum)
-{
-  this->m_option_structure.min_value= (longlong)minimum;
-  return (T_type*)this;
+template <typename T_type, typename T_value>
+T_type *Abstract_integer_number_option<T_type, T_value>::set_minimum_value(
+    T_value minimum) {
+  this->m_option_structure.min_value = (longlong)minimum;
+  return (T_type *)this;
 }
 
-template<typename T_type, typename T_value>
-  T_type* Abstract_integer_number_option<T_type, T_value>::
-    set_maximum_value(T_value maximum)
-{
-  this->m_option_structure.max_value= (ulonglong)maximum;
-  return (T_type*)this;
+template <typename T_type, typename T_value>
+T_type *Abstract_integer_number_option<T_type, T_value>::set_maximum_value(
+    T_value maximum) {
+  this->m_option_structure.max_value = (ulonglong)maximum;
+  return (T_type *)this;
 }
 
-
-}
-}
-}
-}
+}  // namespace Options
+}  // namespace Base
+}  // namespace Tools
+}  // namespace Mysql
 
 #endif