Merge branch 'bb-10.11-release' into bb-11.4-release

Author: sanja-byelkin

client/mysqltest.cc

@@ -1541,12 +1541,12 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query,
       }
       else
       {
-	if (!(v= var_get(p, &p, 0, 0)))
+        if (!(v= var_get(p, &p, 0, 0)) || !v->str_val)
         {
           report_or_die( "Bad variable in eval");
           DBUG_VOID_RETURN;
         }
-	dynstr_append_mem(query_eval, v->str_val, v->str_val_len);
+        dynstr_append_mem(query_eval, v->str_val, v->str_val_len);
       }
       break;
     case '\\':
@@ -9284,8 +9284,9 @@ void do_block(enum block_cmd cmd, struct st_command* command)
 
   /* Parse and evaluate test expression */
   expr_start= strchr(p, '(');
-  if (!expr_start++)
+  if (!expr_start)
     die("missing '(' in %s", cmd_name);
+  expr_start++;
 
   while (my_isspace(charset_info, *expr_start))
     expr_start++;

debian/mariadb-test-data.install

@@ -1,3 +1,4 @@
+usr/lib/mariadb/plugin/test_pam_modules
 usr/share/mariadb/mariadb-test/collections
 usr/share/mariadb/mariadb-test/include
 usr/share/mariadb/mariadb-test/main

include/my_sys.h

@@ -876,7 +876,7 @@ extern my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str,
 				   size_t init_alloc,size_t alloc_increment);
 extern my_bool dynstr_append(DYNAMIC_STRING *str, const char *append);
 my_bool dynstr_append_mem(DYNAMIC_STRING *str, const char *append,
-			  size_t length);
+			  size_t length) __attribute__((nonnull(2)));
 extern my_bool dynstr_append_os_quoted(DYNAMIC_STRING *str, const char *append,
                                        ...);
 extern my_bool dynstr_append_quoted(DYNAMIC_STRING *str,

mysql-test/main/empty_user_table.result mysql-test/main/bad_user_table.resultmysql-test/main/empty_user_table.result renamed to mysql-test/main/bad_user_table.result

@@ -1,3 +1,6 @@
+#
+# MDEV-4462 mysqld gets SIGFPE when mysql.user table is empty
+#
 create table t1 as select * from mysql.global_priv;
 truncate table mysql.global_priv;
 flush privileges;
@@ -14,3 +17,14 @@ connect(localhost,u1,,test,MASTER_PORT,MASTER_SOCKET);
 connect  fail,localhost,u1;
 Got one of the listed errors
 # switching back from mysql.user to mysql.global_priv
+#
+# MDEV-39266 Stack Overflow via alloca() in Privilege Table JSON Parser
+#
+INSERT INTO mysql.global_priv (Host, User, Priv) VALUES
+('localhost', 'MDEV-39266', CONCAT(
+'{"access":0,"plugin":"mysql_native_password","authentication_string":"',
+REPEAT('X', 400000),
+'","password_last_changed":0}'));
+FLUSH PRIVILEGES;
+DROP USER `MDEV-39266`@localhost;
+# End if 10.6 tests

mysql-test/main/empty_user_table.test mysql-test/main/bad_user_table.testmysql-test/main/empty_user_table.test renamed to mysql-test/main/bad_user_table.test

@@ -1,9 +1,9 @@
-#
-# MDEV-4462 mysqld gets SIGFPE when mysql.user table is empty
-#
-
 source include/not_embedded.inc;
 
+--echo #
+--echo # MDEV-4462 mysqld gets SIGFPE when mysql.user table is empty
+--echo #
+
 create table t1 as select * from mysql.global_priv;
 truncate table mysql.global_priv;
 flush privileges;
@@ -34,3 +34,17 @@ flush privileges;
 connect (fail,localhost,u1);
 
 source include/switch_to_mysql_global_priv.inc;
+
+--echo #
+--echo # MDEV-39266 Stack Overflow via alloca() in Privilege Table JSON Parser
+--echo #
+
+INSERT INTO mysql.global_priv (Host, User, Priv) VALUES
+('localhost', 'MDEV-39266', CONCAT(
+  '{"access":0,"plugin":"mysql_native_password","authentication_string":"',
+  REPEAT('X', 400000),
+  '","password_last_changed":0}'));
+FLUSH PRIVILEGES;
+DROP USER `MDEV-39266`@localhost;
+
+--echo # End if 10.6 tests

mysql-test/main/case.result

@@ -158,7 +158,7 @@ Note	1003	select coalesce(1) AS `COALESCE(1)`,coalesce(1.0) AS `COALESCE(1.0)`,c
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `COALESCE(1)` int(1) NOT NULL,
+  `COALESCE(1)` int(2) NOT NULL,
   `COALESCE(1.0)` decimal(2,1) NOT NULL,
   `COALESCE('a')` varchar(1) NOT NULL,
   `COALESCE(1,1.0)` decimal(2,1) NOT NULL,
@@ -589,4 +589,40 @@ case 'X' when 1/0 then 1 when 'X' then 2 else 3 end
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'X'
 Warning	1365	Division by 0
+#
+# MDEV-23278: Incorrect Calculation with AVG() Function
+#
+create table avg_calc_test (
+id int(11) not null auto_increment,
+name varchar(255) default null,
+primary key (id)
+) auto_increment=1 default charset=latin1;
+insert into avg_calc_test (name) values ('orange'), ('blue'), ('black'), ('orange'), ('black');
+select * from (
+select
+avg(case when name = 'orange' then 3 when name = 'blue' then 2 when name = 'black' then 1 else 0 end) as metric_val
+from avg_calc_test
+) t;
+metric_val
+2.0000
+create table t1 as
+select
+avg(case when name = 'orange' then 3 when name = 'blue' then 2 when name = 'black' then 1 else 0 end) as metric_val
+from avg_calc_test;
+select * from t1;
+metric_val
+2.0000
+create or replace table t1 as
+select
+avg(least(1,2)) as metric_val
+from avg_calc_test;
+select * from t1;
+metric_val
+1.0000
+create or replace table t1 as
+select avg(coalesce(1,2)) as metric_val from avg_calc_test;
+select * from t1;
+metric_val
+1.0000
+drop table avg_calc_test, t1;
 # End of 10.11 test

mysql-test/main/case.test

@@ -416,4 +416,41 @@ select case 'X' when null then 1 when 'X' then 2 else 3 end;
 select case 'X' when 1/1 then 1 when 'X' then 2 else 3 end;
 select case 'X' when 1/0 then 1 when 'X' then 2 else 3 end;
 
+--echo #
+--echo # MDEV-23278: Incorrect Calculation with AVG() Function
+--echo #
+create table avg_calc_test (
+  id int(11) not null auto_increment,
+  name varchar(255) default null,
+  primary key (id)
+) auto_increment=1 default charset=latin1;
+insert into avg_calc_test (name) values ('orange'), ('blue'), ('black'), ('orange'), ('black');
+
+select * from (
+  select
+    avg(case when name = 'orange' then 3 when name = 'blue' then 2 when name = 'black' then 1 else 0 end) as metric_val
+  from avg_calc_test
+) t;
+
+create table t1 as
+  select
+    avg(case when name = 'orange' then 3 when name = 'blue' then 2 when name = 'black' then 1 else 0 end) as metric_val
+  from avg_calc_test;
+
+select * from t1;
+
+create or replace table t1 as
+  select
+    avg(least(1,2)) as metric_val
+  from avg_calc_test;
+
+select * from t1;
+
+create or replace table t1 as
+  select avg(coalesce(1,2)) as metric_val from avg_calc_test;
+
+select * from t1;
+
+drop table avg_calc_test, t1;
+
 --echo # End of 10.11 test

mysql-test/main/cte_recursive.result

@@ -5128,7 +5128,7 @@ Warning	1264	Out of range value for column 'mid' at row 5
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `level` int(1) DEFAULT NULL,
+  `level` int(2) DEFAULT NULL,
   `id` int(11) DEFAULT NULL,
   `mid` int(11) DEFAULT NULL,
   `name` text DEFAULT NULL,
@@ -5209,7 +5209,7 @@ Warning	1264	Out of range value for column 'mid' at row 5
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `level` int(1) DEFAULT NULL,
+  `level` int(2) DEFAULT NULL,
   `id` int(11) DEFAULT NULL,
   `mid` int(11) DEFAULT NULL,
   `name` text DEFAULT NULL,

mysql-test/main/ctype_binary.result

@@ -607,7 +607,7 @@ create table t1 as select concat(least(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(1) DEFAULT NULL
+  `c1` varbinary(2) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(greatest(1,2)));
@@ -617,7 +617,7 @@ create table t1 as select concat(greatest(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(1) DEFAULT NULL
+  `c1` varbinary(2) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(case when 11 then 22 else 33 end));
@@ -627,7 +627,7 @@ create table t1 as select concat(case when 11 then 22 else 33 end) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(2) DEFAULT NULL
+  `c1` varbinary(3) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(coalesce(1,2)));
@@ -637,7 +637,7 @@ create table t1 as select concat(coalesce(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(1) DEFAULT NULL
+  `c1` varbinary(2) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat_ws(1,2,3));
@@ -1068,7 +1068,7 @@ create table t1 as select concat(ifnull(1,1)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(1) DEFAULT NULL
+  `c1` varbinary(2) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(ifnull(1.1,1.1)));
@@ -1108,7 +1108,7 @@ create table t1 as select concat(if(1,1,1)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(1) DEFAULT NULL
+  `c1` varbinary(2) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(nullif(1,2)));

mysql-test/main/ctype_cp1251.result

@@ -1019,7 +1019,7 @@ create table t1 as select concat(least(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(greatest(1,2)));
@@ -1029,7 +1029,7 @@ create table t1 as select concat(greatest(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(case when 11 then 22 else 33 end));
@@ -1039,7 +1039,7 @@ create table t1 as select concat(case when 11 then 22 else 33 end) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
+  `c1` varchar(3) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(coalesce(1,2)));
@@ -1049,7 +1049,7 @@ create table t1 as select concat(coalesce(1,2)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat_ws(1,2,3));
@@ -1480,7 +1480,7 @@ create table t1 as select concat(ifnull(1,1)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(ifnull(1.1,1.1)));
@@ -1520,7 +1520,7 @@ create table t1 as select concat(if(1,1,1)) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
+  `c1` varchar(2) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 select hex(concat(nullif(1,2)));