Merge mariadb-10.3.24

Author: dr-m

cmake/os/WindowsCache.cmake

@@ -31,7 +31,6 @@ SET(HAVE_BACKTRACE_SYMBOLS CACHE  INTERNAL "")
 SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE  INTERNAL "")
 SET(HAVE_BFILL CACHE  INTERNAL "")
 SET(HAVE_BSD_SIGNALS CACHE  INTERNAL "")
-SET(HAVE_BSS_START CACHE  INTERNAL "")
 SET(HAVE_CLOCK_GETTIME CACHE  INTERNAL "")
 SET(HAVE_COMPRESS CACHE  INTERNAL "")
 SET(HAVE_CRYPT CACHE  INTERNAL "")

config.h.cmake

@@ -243,7 +243,6 @@
 /* Symbols we may use */
 #cmakedefine HAVE_SYS_ERRLIST 1
 /* used by stacktrace functions */
-#cmakedefine HAVE_BSS_START 1
 #cmakedefine HAVE_BACKTRACE 1
 #cmakedefine HAVE_BACKTRACE_SYMBOLS 1
 #cmakedefine HAVE_BACKTRACE_SYMBOLS_FD 1

configure.cmake

@@ -802,14 +802,6 @@ CHECK_CXX_SOURCE_COMPILES("
   HAVE_ABI_CXA_DEMANGLE)
 ENDIF()
 
-CHECK_C_SOURCE_COMPILES("
-  int main(int argc, char **argv) 
-  {
-    extern char *__bss_start;
-    return __bss_start ? 1 : 0;
-  }"
-HAVE_BSS_START)
-
 CHECK_C_SOURCE_COMPILES("
     int main()
     {

libmariadb

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\FBMYSQL_UPGRADE\FR" "1" "9 May 2017" "MariaDB 10\&.3" "MariaDB Database System"
+.TH "\FBMYSQL_UPGRADE\FR" "1" "20 July 2020" "MariaDB 10\&.3" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -165,6 +165,8 @@ in the data directory\&. This is used to quickly check whether all tables have b
 \fB\-\-force\fR
 option\&.
 .PP
+For this reason, \fBmysql_upgrade\fR needs to be run as a user with write access to the data directory\&.
+.PP
 If you install MariaDB from RPM packages on Linux, you must install the server and client RPMs\&.
 \fBmysql_upgrade\fR
 is included in the server RPM but requires the client RPM because the latter includes

man/mysql_upgrade.1

@@ -1186,13 +1186,13 @@ i	count(*)	std(e1/e2)
 3	4	0.00000000
 select std(s1/s2) from bug22555;
 std(s1/s2)
-0.21325764
+0.21328517
 select std(o1/o2) from bug22555;
 std(o1/o2)
 0.2132576358664934
 select std(e1/e2) from bug22555;
 std(e1/e2)
-0.21325764
+0.21328517
 set @saved_div_precision_increment=@@div_precision_increment;
 set div_precision_increment=19;
 select i, count(*), std(s1/s2) from bug22555 group by i order by i;

mysql-test/main/func_group.result

@@ -25,6 +25,19 @@ ERROR HY000: Table 'user' was not locked with LOCK TABLES
 REVOKE PROCESS ON *.* FROM u;
 ERROR HY000: Table 'user' was not locked with LOCK TABLES
 DROP TABLE t1;
+create database mysqltest1;
+use mysqltest1;
+create table t1(id int);
+insert t1 values(2);
+create user u1@localhost;
+grant select on mysqltest1.t1 to u1@localhost;
+grant update on mysqltest1.* to u1@localhost;
+connect u1, localhost, u1;
+update mysqltest1.t1 set id=1 where id=2;
+connection default;
+disconnect u1;
+drop user u1@localhost;
+drop database mysqltest1;
 #
 # MDEV-20076: SHOW GRANTS does not quote role names properly
 #

mysql-test/main/grant5.result

@@ -34,6 +34,27 @@ REVOKE EXECUTE ON PROCEDURE sp FROM u;
 REVOKE PROCESS ON *.* FROM u;
 DROP TABLE t1;
 
+#
+# MDEV-23010 UPDATE privilege at Database and Table level fail to update with SELECT command denied to user
+#
+create database mysqltest1;
+use mysqltest1;
+create table t1(id int);
+insert t1 values(2);
+create user u1@localhost;
+grant select on mysqltest1.t1 to u1@localhost;
+grant update on mysqltest1.* to u1@localhost;
+connect u1, localhost, u1;
+update mysqltest1.t1 set id=1 where id=2;
+connection default;
+disconnect u1;
+drop user u1@localhost;
+drop database mysqltest1;
+
+#
+# End of 10.1 tests
+#
+
 --echo #
 --echo # MDEV-20076: SHOW GRANTS does not quote role names properly
 --echo #

mysql-test/main/grant5.test

@@ -619,7 +619,7 @@ select 4 - 3 * 2, (4 - 3) * 2, 4 - (3 * 2);
 Testing that / is left associative
 select 15 / 5 / 3, (15 / 5) / 3, 15 / (5 / 3);
 15 / 5 / 3	(15 / 5) / 3	15 / (5 / 3)
-1.00000000	1.00000000	9.0000
+1.00000000	1.00000000	8.9998
 Testing that / has precedence over |
 select 105 / 5 | 2, (105 / 5) | 2, 105 / (5 | 2);
 105 / 5 | 2	(105 / 5) | 2	105 / (5 | 2)

mysql-test/main/parser_precedence.result

@@ -2759,5 +2759,45 @@ SELECT 1 FROM t1 WHERE a XOR 'a';
 1
 DROP TABLE t1;
 #
+# Bug #25207522: INCORRECT ORDER-BY BEHAVIOR ON A PARTITIONED TABLE
+# WITH A COMPOSITE PREFIX INDEX
+#
+create table t1(id int unsigned not null,
+data varchar(2) default null,
+key data_idx (data(1),id)
+) default charset=utf8
+partition by range (id) (
+partition p10 values less than (10),
+partition p20 values less than (20)
+);
+insert t1 values (6, 'ab'), (4, 'ab'), (5, 'ab'), (16, 'ab'), (14, 'ab'), (15, 'ab'), (5, 'ac'), (15, 'aa') ;
+select id from t1 where data = 'ab' order by id;
+id
+4
+5
+6
+14
+15
+16
+drop table t1;
+create table t1(id int unsigned not null,
+data text default null,
+key data_idx (data(1),id)
+) default charset=utf8
+partition by range (id) (
+partition p10 values less than (10),
+partition p20 values less than (20)
+);
+insert t1 values (6, 'ab'), (4, 'ab'), (5, 'ab'), (16, 'ab'), (14, 'ab'), (15, 'ab'), (5, 'ac'), (15, 'aa') ;
+select id from t1 where data = 'ab' order by id;
+id
+4
+5
+6
+14
+15
+16
+drop table t1;
+#
 # End of 10.1 tests
 #