Merge mariadb-10.4.8 to 10.4

MariaDB · Sep 10, 2019 · e980cf9 · e980cf9
2 parents e2f570b + 4c2464b
commit e980cf9
Show file tree

Hide file tree

Showing 22 changed files with 318 additions and 158 deletions.
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
@@ -39,6 +39,7 @@ ELSE()
   SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
   OPTION(CPACK_RPM_DEBUGINFO_PACKAGE "" ON)
   MARK_AS_ADVANCED(CPACK_RPM_DEBUGINFO_PACKAGE)
+  SET(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}")
 ENDIF()
 
 SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")
@@ -270,7 +271,6 @@ IF(CMAKE_VERSION VERSION_GREATER "3.9.99")
 SET(CPACK_SOURCE_GENERATOR "RPM")
 SETA(CPACK_RPM_SOURCE_PKG_BUILD_PARAMS
   "-DRPM=${RPM}"
-  "-DCPACK_RPM_BUILD_SOURCE_DIRS_PREFIX=/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}"
   )
 
 MACRO(ADDIF var)

diff --git a/mysql-test/lib/My/Handles.pm b/mysql-test/lib/My/Handles.pm
@@ -24,8 +24,10 @@ use My::Platform;
 
 my $handle_exe;
 
-
-if (IS_WINDOWS){
+sub import {
+  my $self = shift;
+  my $params = shift;
+  return if (!IS_WINDOWS || $handle_exe);
   # Check if handle.exe is available
   # Pass switch to accept the EULA to avoid hanging
   # if the program hasn't been run before.
@@ -35,7 +37,7 @@ if (IS_WINDOWS){
     $handle_exe= "$2.$3"
       if ($line =~ /(Nth|H)andle v([0-9]*)\.([0-9]*)/);
   }
-  if ($handle_exe){
+  if ($handle_exe && (!$params || !$params->{suppress_init_messages})){
     print "Found handle.exe version $handle_exe\n";
   }
 }

diff --git a/mysql-test/main/selectivity.result b/mysql-test/main/selectivity.result
@@ -1634,8 +1634,6 @@ SELECT @cnt;
 @cnt
 2
 alter table  t1 force;
-set @@use_stat_tables= @save_use_stat_tables;
-set @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity;
 drop table t1;
 drop function f1;
 #

diff --git a/mysql-test/main/selectivity.test b/mysql-test/main/selectivity.test
@@ -1102,8 +1102,6 @@ set @@optimizer_use_condition_selectivity=4;
 SELECT * FROM t1 WHERE a = f1();
 SELECT @cnt;
 alter table  t1 force;
-set @@use_stat_tables= @save_use_stat_tables;
-set @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity;
 drop table t1;
 drop function f1;
 

diff --git a/mysql-test/main/selectivity_innodb.result b/mysql-test/main/selectivity_innodb.result
@@ -1644,8 +1644,6 @@ SELECT @cnt;
 @cnt
 2
 alter table  t1 force;
-set @@use_stat_tables= @save_use_stat_tables;
-set @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity;
 drop table t1;
 drop function f1;
 #
@@ -1661,19 +1659,19 @@ test.t1	analyze	status	OK
 # Check what info the optimizer has about selectivities
 explain extended select * from t1 use index () where a in (17,51,5);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1091	3.83	Using where
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	3.90	Using where
 Warnings:
 Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` USE INDEX () where `test`.`t1`.`a` in (17,51,5)
 explain extended select * from t1 use index () where b=2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1091	5.47	Using where
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	5.47	Using where
 Warnings:
 Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` USE INDEX () where `test`.`t1`.`b` = 2
 # Now, the equality is used for ref access, while the range condition
 # gives selectivity data
 explain extended select * from t1 where a in (17,51,5) and b=2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	ref|filter	b,a	b|a	5|5	const	59 (3%)	2.66	Using where; Using rowid filter
+1	SIMPLE	t1	ref|filter	b,a	b|a	5|5	const	59 (3%)	2.90	Using where; Using rowid filter
 Warnings:
 Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`b` = 2 and `test`.`t1`.`a` in (17,51,5)
 drop table t1;

diff --git a/mysql-test/suite/mariabackup/big_innodb_log.test b/mysql-test/suite/mariabackup/big_innodb_log.test
@@ -76,6 +76,7 @@ rmdir $targetdir;
 
 perl;
 use lib "lib";
+use My::Handles { suppress_init_messages => 1 };
 use My::File::Path;
 my $install_db_dir = ($ENV{MTR_PARALLEL} == 1) ?
   "$ENV{'MYSQLTEST_VARDIR'}/install.db" :

diff --git a/mysql-test/suite/mariabackup/disabled.def b/mysql-test/suite/mariabackup/disabled.def
diff --git a/mysql-test/suite/period/r/versioning.result b/mysql-test/suite/period/r/versioning.result
@@ -87,8 +87,4 @@ x	s	e	if(row_start = @ins_time, "OLD", "NEW")	check_row(row_start, row_end)
 2	1999-01-01	1999-12-12	OLD	CURRENT ROW
 6	2000-01-01	2018-01-01	NEW	CURRENT ROW
 drop table t,log_tbl;
-drop function check_row;
-drop function current_row;
-drop procedure verify_trt;
-drop procedure verify_trt_dummy;
 drop procedure log;
diff --git a/mysql-test/suite/period/t/versioning.test b/mysql-test/suite/period/t/versioning.test
@@ -57,8 +57,5 @@ select *, if(row_start = @ins_time, "OLD", "NEW"), check_row(row_start, row_end)
        order by x, s, e, row_start;
 
 drop table t,log_tbl;
-drop function check_row;
-drop function current_row;
-drop procedure verify_trt;
-drop procedure verify_trt_dummy;
 drop procedure log;
+source suite/versioning/common_finish.inc;