PS-9474: Code refresh for PS 8.0.40 (conflicts solved)

Author: inikep

MYSQL_VERSION

@@ -1,13 +1,5 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-<<<<<<< HEAD
-MYSQL_VERSION_PATCH=39
-MYSQL_VERSION_EXTRA=-30
-||||||| d69a12a9453
-MYSQL_VERSION_PATCH=39
-MYSQL_VERSION_EXTRA=
-=======
 MYSQL_VERSION_PATCH=40
-MYSQL_VERSION_EXTRA=
->>>>>>> mysql-8.0.40
+MYSQL_VERSION_EXTRA=-31
 MYSQL_VERSION_STABILITY="LTS"

cmake/component.cmake

@@ -105,11 +105,6 @@ MACRO(MYSQL_ADD_COMPONENT component_arg)
 
     # To hide the component symbols in the shared object
     IF(UNIX)
-<<<<<<< HEAD
-      IF(MY_COMPILER_IS_CLANG AND WITH_UBSAN)
-        # nothing, clang/ubsan gets confused
-        UNSET(COMPONENT_COMPILE_VISIBILITY CACHE)
-      ELSE()
         # Use this also for component libraries and tests.
         SET(COMPONENT_COMPILE_VISIBILITY
           "-fvisibility=hidden" CACHE INTERNAL
@@ -137,25 +132,6 @@ MACRO(MYSQL_ADD_COMPONENT component_arg)
           CXX_VISIBILITY_PRESET hidden
           VISIBILITY_INLINES_HIDDEN YES
         )
-      ENDIF()
-||||||| d69a12a9453
-      IF(MY_COMPILER_IS_CLANG AND WITH_UBSAN)
-        # nothing, clang/ubsan gets confused
-        UNSET(COMPONENT_COMPILE_VISIBILITY CACHE)
-      ELSE()
-        # Use this also for component libraries and tests.
-        SET(COMPONENT_COMPILE_VISIBILITY
-          "-fvisibility=hidden" CACHE INTERNAL
-          "Use -fvisibility=hidden for components" FORCE)
-        TARGET_COMPILE_OPTIONS(${target} PRIVATE "-fvisibility=hidden")
-      ENDIF()
-=======
-      # Use this also for component libraries and tests.
-      SET(COMPONENT_COMPILE_VISIBILITY
-        "-fvisibility=hidden" CACHE INTERNAL
-        "Use -fvisibility=hidden for components" FORCE)
-      TARGET_COMPILE_OPTIONS(${target} PRIVATE "-fvisibility=hidden")
->>>>>>> mysql-8.0.40
     ENDIF()
 
     IF(NOT ARG_SKIP_INSTALL)

extra/libfido2/libfido2-1.15.0/src/CMakeLists.txt

@@ -151,15 +151,9 @@ IF(WIN32)
 ELSEIF(APPLE)
   TARGET_LINK_LIBRARIES(fido2 "-framework CoreFoundation" "-framework IOKit")
 ENDIF()
-<<<<<<< HEAD:extra/libfido2/libfido2-1.13.0/src/CMakeLists.txt
+
 IF(WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_CLIENT_PLUGINS
 		OR WITH_PERCONA_AUTHENTICATION_FIDO)
-||||||| d69a12a9453:extra/libfido2/libfido2-1.13.0/src/CMakeLists.txt
-IF(WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_CLIENT_PLUGINS)
-=======
-
-IF(WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_CLIENT_PLUGINS)
->>>>>>> mysql-8.0.40:extra/libfido2/libfido2-1.15.0/src/CMakeLists.txt
   INSTALL_PRIVATE_LIBRARY(fido2)
 ENDIF()
 

man/mysqldumpslow.1

@@ -2,24 +2,12 @@
 .\"     Title: mysqldumpslow
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-<<<<<<< HEAD
 .\"      Date: 08/31/2023
-||||||| d69a12a9453
-.\"      Date: 05/31/2024
-=======
-.\"      Date: 09/17/2024
->>>>>>> mysql-8.0.40
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-<<<<<<< HEAD
 .TH "MYSQLDUMPSLOW" "1" "08/31/2023" "MySQL 8\&.0" "MySQL Database System"
-||||||| d69a12a9453
-.TH "MYSQLDUMPSLOW" "1" "05/31/2024" "MySQL 8\&.0" "MySQL Database System"
-=======
-.TH "MYSQLDUMPSLOW" "1" "09/17/2024" "MySQL 8\&.0" "MySQL Database System"
->>>>>>> mysql-8.0.40
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

mysql-test/r/olap.result

@@ -2365,7 +2365,20 @@ EXECUTE ps;
 x
 DROP PREPARE ps;
 DROP TABLE t;
-<<<<<<< HEAD
+#
+# Bug#36444257: `false' in operator at sql/sql_executor.cc
+#
+CREATE TABLE t1(f1 INTEGER);
+SELECT SUM(TAN(0)) OVER() FROM t1 GROUP BY TAN(0) WITH ROLLUP;
+SUM(TAN(0)) OVER()
+DROP TABLE t1;
+#
+# Bug#36804785: `false' in operator at sql/sql_executor.cc
+#
+CREATE TABLE t1(f1 INTEGER);
+SELECT SUM(UTC_DATE()) OVER() FROM t1 GROUP BY UTC_DATE() WITH ROLLUP;
+SUM(UTC_DATE()) OVER()
+DROP TABLE t1;
 #
 # PS-8328: MySQL 8 Crash when using group_concat with group by with
 #          rollup.
@@ -2398,20 +2411,3 @@ i	string	GROUP_CONCAT(string)
 20	NULL	something_completely_else
 NULL	NULL	something,something_else,something_completely_else
 DROP TABLE t1;
-||||||| d69a12a9453
-=======
-#
-# Bug#36444257: `false' in operator at sql/sql_executor.cc
-#
-CREATE TABLE t1(f1 INTEGER);
-SELECT SUM(TAN(0)) OVER() FROM t1 GROUP BY TAN(0) WITH ROLLUP;
-SUM(TAN(0)) OVER()
-DROP TABLE t1;
-#
-# Bug#36804785: `false' in operator at sql/sql_executor.cc
-#
-CREATE TABLE t1(f1 INTEGER);
-SELECT SUM(UTC_DATE()) OVER() FROM t1 GROUP BY UTC_DATE() WITH ROLLUP;
-SUM(UTC_DATE()) OVER()
-DROP TABLE t1;
->>>>>>> mysql-8.0.40

mysql-test/suite/innodb/include/doublewrite.inc

@@ -59,7 +59,7 @@ SET GLOBAL innodb_checkpoint_disabled = 1;
 SET GLOBAL innodb_saved_page_number_debug = 0;
 
 # Set the page dirty and force a flush to disk
---exec echo "restart " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/expect_crash.inc
 --error CR_SERVER_LOST
 SET GLOBAL innodb_fil_make_page_dirty_debug = @space_id;
 
@@ -98,13 +98,14 @@ SET GLOBAL innodb_checkpoint_disabled = 1;
 SET GLOBAL innodb_saved_page_number_debug = 0;
 
 # Set the page dirty and force a flush to disk
---exec echo "restart " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/expect_crash.inc
 --error CR_SERVER_LOST
 SET GLOBAL innodb_fil_make_page_dirty_debug = @space_id;
 
 --echo # Corrupt the first page (page_no=0) of the user tablespace.
 --let IBD_FILE=$MYSQLD_DATADIR/test/t1.ibd
 --let PAGE_NUM="0"
+--let ALL_ZEROES=0
 --source corrupt_page.inc
 
 --source include/start_mysqld.inc
@@ -135,7 +136,7 @@ SET GLOBAL innodb_checkpoint_disabled = 1;
 SET GLOBAL innodb_saved_page_number_debug = 1;
 
 # Set the page dirty and force a flush to disk
---exec echo "restart " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/expect_crash.inc
 --error CR_SERVER_LOST
 SET GLOBAL innodb_fil_make_page_dirty_debug = @space_id;
 
@@ -173,13 +174,14 @@ SET GLOBAL innodb_checkpoint_disabled = 1;
 SET GLOBAL innodb_saved_page_number_debug = 1;
 
 # Set the page dirty and force a flush to disk
---exec echo "restart " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/expect_crash.inc
 --error CR_SERVER_LOST
 SET GLOBAL innodb_fil_make_page_dirty_debug = @space_id;
 
 --echo # Corrupt the 2nd page (page_no=1) of the user tablespace.
 --let IBD_FILE=$MYSQLD_DATADIR/test/t1.ibd
 --let PAGE_NUM=1
+--let ALL_ZEROES=0
 --source corrupt_page.inc
 
 --source include/start_mysqld.inc
@@ -203,7 +205,7 @@ SET GLOBAL innodb_checkpoint_disabled = 1;
 SET GLOBAL innodb_saved_page_number_debug = 0;
 
 # Set the page dirty and force a flush to disk
---exec echo "restart " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/expect_crash.inc
 --error CR_SERVER_LOST
 SET GLOBAL innodb_fil_make_page_dirty_debug = 0;
 
@@ -235,13 +237,14 @@ SET GLOBAL innodb_checkpoint_disabled = 1;
 SET GLOBAL innodb_saved_page_number_debug = 0;
 
 # Set the page dirty and force a flush to disk
---exec echo "restart " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/expect_crash.inc
 --error CR_SERVER_LOST
 SET GLOBAL innodb_fil_make_page_dirty_debug = 0;
 
 --echo # Corrupt the first page (page_no=0) of the system tablespace.
 --let IBD_FILE=$MYSQLD_DATADIR/ibdata1
 --let PAGE_NUM="0"
+--let ALL_ZEROES=0
 --source corrupt_page.inc
 
 --source include/start_mysqld.inc
@@ -265,7 +268,7 @@ SET GLOBAL innodb_checkpoint_disabled = 1;
 SET GLOBAL innodb_saved_page_number_debug = 1;
 
 # Set the page dirty and force a flush to disk
---exec echo "restart " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/expect_crash.inc
 --error CR_SERVER_LOST
 SET GLOBAL innodb_fil_make_page_dirty_debug = 0;
 
@@ -297,14 +300,15 @@ SET GLOBAL innodb_checkpoint_disabled = 1;
 SET GLOBAL innodb_saved_page_number_debug = 1;
 
 # Set the page dirty and force a flush to disk
---exec echo "restart " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/expect_crash.inc
 --error CR_SERVER_LOST
 SET GLOBAL innodb_fil_make_page_dirty_debug = 0;
 
 --echo # Make the 2nd page (page_no=1) of the system tablespace
 --echo # all zeroes.
 --let IBD_FILE=$MYSQLD_DATADIR/ibdata1
 --let PAGE_NUM=1
+--let ALL_ZEROES=0
 --source corrupt_page.inc
 
 --source include/start_mysqld.inc

mysql-test/suite/innodb/r/parallel_read_kill.result

@@ -12,15 +12,7 @@ END|
 CREATE TABLE t1(
 f1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 f2 INT NOT NULL,
-<<<<<<< HEAD
-f3 INT NOT NULL
-)
-||||||| d69a12a9453
-f3 INT NOT NULL,
-KEY(f2, f3))
-=======
 f3 INT NOT NULL)
->>>>>>> mysql-8.0.40
 ENGINE=INNODB;
 # Create 150000 uncommitted rows
 SET TRANSACTION ISOLATION LEVEL READ COMMITTED;