Revert "feat: upgrade from base line 8.1.0 to tag 8.4.2 #78"

.clang-format

@@ -1,16 +1,15 @@
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # 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,
 # as published by the Free Software Foundation.
 #
-# This program is designed to work with certain software (including
+# This program is also distributed with certain software (including
 # but not limited to OpenSSL) that is licensed under separate terms,
 # as designated in a particular file or component or in included license
 # documentation.  The authors of MySQL hereby grant you an additional
 # permission to link the program and your derivative works with the
-# separately licensed software that they have either included with
-# the program or referenced in the documentation.
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -98,15 +97,15 @@ ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DeriveLineEnding: true
-#DerivePointerAlignment: true
+DerivePointerAlignment: true
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
-#IncludeBlocks:   Regroup
+IncludeBlocks:   Regroup
 IncludeCategories:
   - Regex:           '^<ext/.*\.h>'
     Priority:        2
@@ -146,7 +145,7 @@ PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
-#PointerAlignment: Left
+PointerAlignment: Left
 RawStringFormats:
   - Language:        Cpp
     Delimiters:
@@ -197,7 +196,7 @@ SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 SpaceBeforeSquareBrackets: false
-#Standard:        Auto
+Standard:        Auto
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
@@ -210,8 +209,8 @@ UseTab:          Never
 DerivePointerAlignment: false
 PointerAlignment: Right
 
-# MySQL source code is allowed to use the latest c++ features.
-Standard:        Latest
+# MySQL source code is allowed to use C++11 (and C++14) features.
+Standard:        Cpp11
 
 # MySQL includes frequently are not order-independent (e.g. my_config.h needs
 # to go on top). This is unfortunate, but not something we can change easily,
@@ -269,7 +268,7 @@ BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
-ColumnLimit:     120
+ColumnLimit:     80
 CommentPragmas:  '(taze:|^/[ 	]*<|@see)'
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true

.clang-tidy

@@ -1,16 +1,15 @@
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 #
 # 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,
 # as published by the Free Software Foundation.
 #
-# This program is designed to work with certain software (including
+# This program is also distributed with certain software (including
 # but not limited to OpenSSL) that is licensed under separate terms,
 # as designated in a particular file or component or in included license
 # documentation.  The authors of MySQL hereby grant you an additional
 # permission to link the program and your derivative works with the
-# separately licensed software that they have either included with
-# the program or referenced in the documentation.
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,7 +24,6 @@ Checks:
   -*,
   bugprone-*,
   -bugprone-easily-swappable-parameters,
-  -bugprone-narrowing-conversions,
   clang-analyzer-*,
   -clang-diagnostic-unused-function,
   cppcoreguidelines-*,
@@ -36,30 +34,21 @@ Checks:
   -cppcoreguidelines-pro-bounds-pointer-arithmetic,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   -cppcoreguidelines-pro-type-vararg,
-  -cppcoreguidelines-non-private-member-variables-in-classes,
-  -cppcoreguidelines-pro-type-reinterpret-cast,
-  -cppcoreguidelines-narrowing-conversions,
   google-*,
   -google-readability-todo,
   -google-readability-braces-around-statements,
   -google-runtime-int,
-  -google-build-using-namespace,
   misc-*,
   -misc-const-correctness,
-  -misc-non-private-member-variables-in-classes,
   modernize-use-nullptr,
   llvm-*,
   -llvm-header-guard,
   -llvm-include-order,
   performance-*,
   readability-*,
   -readability-braces-around-statements,
-  -readability-named-parameter,
-  -readability-redundant-member-init,
-  -readability-magic-numbers,
-  -clang-diagnostic-error,
-
-
+  -readability-named-parameter
+  -readability-redundant-member-init
 
 CheckOptions:
   - key:        readability-magic-numbers.IgnoredIntegerValues

.gitattributes

@@ -1,6 +1,7 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 
+filter=lfs diff=lfs merge=lfs -text
 # All MySQL code is auto-formatted using clang-format.
 *.c filter=codeformat
 *.cc filter=codeformat
@@ -15,6 +16,8 @@
 /extra/** !filter
 /internal/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
 /plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/** !filter
 
@@ -37,3 +40,12 @@
 /strings/uca_data.h !filter
 /internal/meb/meb/mysqloption_list.cpp !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

.gitconfig

@@ -1,16 +1,15 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 #
 # 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,
 # as published by the Free Software Foundation.
 #
-# This program is designed to work with certain software (including
+# This program is also distributed with certain software (including
 # but not limited to OpenSSL) that is licensed under separate terms,
 # as designated in a particular file or component or in included license
 # documentation.  The authors of MySQL hereby grant you an additional
 # permission to link the program and your derivative works with the
-# separately licensed software that they have either included with
-# the program or referenced in the documentation.
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

.github/workflows/pull-requests.yaml

@@ -70,19 +70,20 @@ jobs:
     #  run: |
     #    sudo apt install  bison texinfo libgmp3-dev zlib1g-dev -y && sudo apt install gcc-10 g++-10 -y && \
     #    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 && sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
-    #- name: install_boost # From mysql-8.4.2, boost version 1.8.4 already exists in extra dir.
-    #  run: |
-    #    cd /tmp && wget https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.gz && \
-    #    tar zxvf boost_1_77_0.tar.gz && cd boost_1_77_0 && ./bootstrap.sh --prefix=/usr/local/boost && ./b2 -j$(nproc) && sudo ./b2 install && \
-    #    sudo rm /tmp/boost_1_77_0 -rf && sudo rm /tmp/boost_1_77_0.tar.gz
+    - name: install_boost
+      run: |
+        cd /tmp && wget https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.gz && \
+        tar zxvf boost_1_77_0.tar.gz && cd boost_1_77_0 && ./bootstrap.sh --prefix=/usr/local/boost && ./b2 -j$(nproc) && sudo ./b2 install && \
+        sudo rm /tmp/boost_1_77_0 -rf && sudo rm /tmp/boost_1_77_0.tar.gz
       #sed -i '61s/^/#/' cmake_install.cmake to disable can not find openssl_executeable error. removes it when it fixed.
     - name: build_shannon_and_install
       run: |
-        #sudo mkdir /home/ShannonBase  && cd /home/ShannonBase
+        mkdir /home/ShannonBase  && cd /home/ShannonBase
         mkdir cmake_build && cd cmake_build
-        #git config --global --add safe.directory /home/ShannonBase
+        git config --global --add safe.directory /home/ShannonBase
         git fetch --tags -f
         cmake ../ \
+        -DWITH_BOOST=/usr/local/boost/include \
         -DCMAKE_BUILD_TYPE=Release  \
         -DCMAKE_INSTALL_PREFIX=/home/shannon-bin/ \
         -DMYSQL_DATADIR=/home/shannon-bin/ \
@@ -100,7 +101,7 @@ jobs:
         -DWITH_SSL_PATH=/usr/include/openssl/ \
         -DDEFAULT_SET=community \
         -DWITH_UNIT_TESTS=OFF \
-        -DCOMPILATION_COMMENT="MySQL Community Server, and Shannon Data AI Alpha V.- (GPL)" && make -j$(nproc) && \
+        -DCOMPILATION_COMMENT="MySQL Community Server, and Shannon Data AI Alpha V.- (GPL)" && make -j5 && \
         sed -i '61s/^/#/' cmake_install.cmake && sed -i '62s/^/#/' cmake_install.cmake && sed -i '63s/^/#/' cmake_install.cmake && \
         sudo make install
     - name: clean_up_shannonbase_build
@@ -113,4 +114,4 @@ jobs:
         cd /home/shannon-bin/mysql-test/
         sudo chmod -R u+rwx mysql-test-run.pl
         ./mysql-test-run.pl --suite=main,innodb,binlog,binlog_gtid,binlog_nogtid,federated,secondary_engine,rpl,rpl_gtid,rpl_nogtid \
-        --mysqld=--user=$USER --mysqld=--default-storage-engine=innodb --nowarnings --force --nocheck-testcases --retry=5 --parallel=$(nproc)
+        --mysqld=--user=$USER --mysqld=--default-storage-engine=innodb --nowarnings --force --nocheck-testcases --retry=0 --parallel=$(nproc)

.gitignore

@@ -6,6 +6,9 @@ tags
 TAGS
 TAGS_sorted_by_file
 
+# googletest files
+source_downloads
+
 # Vim swap files
 [._]*.s[a-v][a-z]
 [._]*.sw[a-p]
@@ -28,4 +31,3 @@ scalability_jobs_*
 .cproject
 .project
 .settings/
-