Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: I7a3ef0f4db3b27fd933e7d47ff40ac8d84bcdffc

Author: bjornmu

packaging/rpm-oel/mysql.spec.in

@@ -41,6 +41,11 @@
 %global with_router 1
 %endif
 
+# PGO option, currently only for el7
+%if 0%{?rhel} == 7
+%{?with_pgo:   %global pgo 1}
+%endif # rhel7
+
 # Pass path to mecab lib
 %{?with_mecab: %global mecab_option -DWITH_MECAB=%{with_mecab}}
 %{?with_mecab: %global mecab 1}
@@ -867,6 +872,7 @@ mkdir release
 (
   cd release
   %{cmake3} ../%{src_dir} \
+           %{?pgo:-DFPROFILE_GENERATE=1} \
            -DBUILD_CONFIG=mysql_release \
            -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -916,6 +922,74 @@ mkdir release
   make %{?_smp_mflags} VERBOSE=1
 )
 
+%if 0%{?pgo}
+(
+  # Run some MTR load to generate profile data
+  [ -d profile-data ] && rm -rf profile-data
+  pushd release/mysql-test
+  ./mtr \
+    --mem --parallel=auto --force --retry=0 \
+    --mysqld=--binlog-format=row \
+    --clean-vardir --suite=main || true
+  rm -r $(readlink var)
+  popd
+
+  # Build again with profile data present
+  rm -rf release
+  mkdir release && pushd release
+  cmake3 ../%{src_dir} \
+           -DFPROFILE_USE=1 \
+           -DBUILD_CONFIG=mysql_release \
+           -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	   -DWITH_BOOST=.. \
+           -DCMAKE_C_FLAGS="%{optflags}" \
+           -DCMAKE_CXX_FLAGS="%{optflags}" \
+           -DUSE_LD_LLD=0 \
+%if 0%{?ssl_default}
+%else
+           -DWITH_AUTHENTICATION_CLIENT_PLUGINS=0 \
+           -DWITH_AUTHENTICATION_FIDO=0 \
+           -DWITH_AUTHENTICATION_KERBEROS=0 \
+           -DWITH_AUTHENTICATION_LDAP=0 \
+           -DWITH_AUTHENTICATION_OCI=0 \
+           -DWITH_COMPONENT_KEYRING_OCI=0 \
+           -DWITH_CURL=0 \
+           -DWITH_KEYRING_HASHICORP=0 \
+           -DWITH_KEYRING_OCI=0 \
+%endif # ssl_default
+           -DWITH_CURL=system \
+%if 0%{?systemd}
+           -DWITH_SYSTEMD=1 \
+%endif
+           -DWITH_ROUTER=%{with_router} \
+%if 0%{?cluster}
+           -DWITH_NDB=1 \
+%endif
+%if 0%{?ndb_nodejs_path:1}
+           -DNDB_NODEJS_PATH=%{ndb_nodejs_path} \
+%endif
+%if 0%{?ndb_nodejs_extras_path:1}
+           -DNDB_NODEJS_EXTRAS_PATH=%{ndb_nodejs_extras_path} \
+%endif
+%if 0%{?commercial}
+           -DWITH_MEB=%{with_meb} \
+           %{?aws_sdk_option} \
+%endif
+           %{?ssl_option} \
+           %{?mini_debug_option} \
+           -DWITH_INNODB_MEMCACHED=1 \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DMYSQLX_UNIX_ADDR="/var/run/mysqld/mysqlx.sock" \
+           -DWITH_NUMA=1 \
+           %{?mecab_option} \
+           -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
+           -DCOMPILATION_COMMENT_SERVER="%{compilation_comment_server_release}" \
+           -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
+  make %{?_smp_mflags} VERBOSE=1
+)
+%endif # pgo
+
 %install
 
 %if 0%{?compatlib}