Merge remote-tracking branch 'origin/10.1' into 10.2

client/mysqltest.cc

@@ -2723,7 +2723,7 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
   init_dynamic_string(&ds_query, 0, (end - query) + 32, 256);
   do_eval(&ds_query, query, end, FALSE);
 
-  if (mysql_real_query(mysql, ds_query.str, ds_query.length)) 
+  if (mysql_real_query(mysql, ds_query.str, ds_query.length) || !(res= mysql_store_result(mysql)))
   {
     handle_error(curr_command, mysql_errno(mysql), mysql_error(mysql),
                  mysql_sqlstate(mysql), &ds_res);
@@ -2733,13 +2733,6 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
     DBUG_VOID_RETURN;
   }
 
-  if (!(res= mysql_store_result(mysql)))
-  {
-    report_or_die("Query '%s' didn't return a result set", ds_query.str);
-    dynstr_free(&ds_query);
-    eval_expr(var, "", 0);
-    DBUG_VOID_RETURN;
-  }
   dynstr_free(&ds_query);
 
   if ((row= mysql_fetch_row(res)) && row[0])

configure.cmake

@@ -1022,6 +1022,9 @@ CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H)
 IF(NOT HAVE_UCONTEXT_H)
   CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H)
 ENDIF()
+IF(HAVE_UCONTEXT_H)
+  CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H)
+ENDIF()
 
 CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_sec "time.h" STRUCT_TIMESPEC_HAS_TV_SEC)
 CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_nsec "time.h" STRUCT_TIMESPEC_HAS_TV_NSEC)

debian/control

@@ -34,8 +34,8 @@ Build-Depends: bison,
                zlib1g-dev (>= 1:1.1.3-5~)
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
-Vcs-Git: https://github.com/MariaDB/server.git
 Vcs-Browser: https://github.com/MariaDB/server/
+Vcs-Git: https://github.com/MariaDB/server.git
 
 Package: libmariadb3
 Architecture: any

mysql-test/include/wait_condition.inc

@@ -39,7 +39,7 @@ let $wait_timeout= 0;
 let $wait_condition_reps= 0;
 while ($wait_counter)
 {
-    --error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT,ER_UNKNOWN_COM_ERROR
+    --error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT,ER_UNKNOWN_COM_ERROR,ER_LOCK_DEADLOCK
     let $success= `$wait_condition`;
     inc $wait_condition_reps;
     if ($success)

mysql-test/r/func_date_add.result

@@ -102,6 +102,57 @@ select * from t1 where case a when adddate( '2012-12-12', 7 ) then true end;
 a
 drop table t1;
 End of 5.5 tests
+#
+# Start of 10.1 tests
+#
+#
+# MDEV-14452 Precision in INTERVAL xxx DAY_MICROSECOND parsed wrong?
+#
+SELECT
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5' DAY_MICROSECOND) c1,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50' DAY_MICROSECOND) c2,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500' DAY_MICROSECOND) c3,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000' DAY_MICROSECOND) c4,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000' DAY_MICROSECOND) c5,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000' DAY_MICROSECOND) c6,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000' DAY_MICROSECOND) c7,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000' DAY_MICROSECOND) c8,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000000' DAY_MICROSECOND) c9,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000000' DAY_MICROSECOND) c10,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000000' DAY_MICROSECOND) c11,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000000000' DAY_MICROSECOND) c12,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000000000' DAY_MICROSECOND) c13,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000000000' DAY_MICROSECOND) c14,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000000000000' DAY_MICROSECOND) c15,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000000000000' DAY_MICROSECOND) c16,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000000000000' DAY_MICROSECOND) c17,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000000000000000' DAY_MICROSECOND) c18,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000000000000000' DAY_MICROSECOND) c19,
+DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000000000000000' DAY_MICROSECOND) c20
+;
+c1	1000-01-01 00:00:01.500000
+c2	1000-01-01 00:00:01.500000
+c3	1000-01-01 00:00:01.500000
+c4	1000-01-01 00:00:01.500000
+c5	1000-01-01 00:00:01.500000
+c6	1000-01-01 00:00:01.500000
+c7	1000-01-01 00:00:01.500000
+c8	1000-01-01 00:00:01.500000
+c9	1000-01-01 00:00:01.500000
+c10	1000-01-01 00:00:01.500000
+c11	1000-01-01 00:00:01.500000
+c12	1000-01-01 00:00:01.500000
+c13	1000-01-01 00:00:01.500000
+c14	1000-01-01 00:00:01.500000
+c15	1000-01-01 00:00:01.500000
+c16	1000-01-01 00:00:01.500000
+c17	1000-01-01 00:00:01.500000
+c18	1000-01-01 00:00:01.500000
+c19	1000-01-01 00:00:01.500000
+c20	NULL
+#
+# End of 10.1 tests
+#
 create or replace view v1 as select 3 & 20010101 + interval 2 day as x;
 show create view v1;
 View	Create View	character_set_client	collation_connection

mysql-test/r/func_time.result

@@ -2905,6 +2905,30 @@ NULL
 Warnings:
 Warning	1441	Datetime function: datetime field overflow
 #
+# MDEV-13202 Assertion `ltime->neg == 0' failed in date_to_datetime
+#
+CREATE TABLE t1 (i INT, d DATE);
+INSERT INTO t1 VALUES (1, '1970-01-01');
+SELECT MAX(NULLIF(i,1)) FROM t1 ORDER BY DATE_SUB(d,INTERVAL 17300000 HOUR);
+MAX(NULLIF(i,1))
+NULL
+Warnings:
+Warning	1441	Datetime function: datetime field overflow
+DROP TABLE t1;
+CREATE TABLE t1 (i INT, d DATE);
+INSERT INTO t1 VALUES (1, '1970-01-01');
+SELECT CONCAT(DATE_SUB(d, INTERVAL 17300000 HOUR)) FROM t1;
+CONCAT(DATE_SUB(d, INTERVAL 17300000 HOUR))
+NULL
+Warnings:
+Warning	1441	Datetime function: datetime field overflow
+DROP TABLE t1;
+SELECT CONCAT(DATE_SUB(TIMESTAMP'1970-01-01 00:00:00', INTERVAL 17300000 HOUR));
+CONCAT(DATE_SUB(TIMESTAMP'1970-01-01 00:00:00', INTERVAL 17300000 HOUR))
+NULL
+Warnings:
+Warning	1441	Datetime function: datetime field overflow
+#
 # End of 10.0 tests
 #
 #

mysql-test/r/subselect_mat.result

@@ -2757,6 +2757,21 @@ a	b	sq
 4	2	1
 drop table t1, t2;
 #
+# MDEV-15235: Assertion `length > 0' failed in create_ref_for_key
+#
+CREATE TABLE t1 (i INT);
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (f CHAR(1));
+INSERT INTO t2 VALUES ('a'),('b');
+explain
+SELECT * FROM t2 WHERE f IN ( SELECT LEFT('foo',0) FROM t1 ORDER BY 1 );
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	
+SELECT * FROM t2 WHERE f IN ( SELECT LEFT('foo',0) FROM t1 ORDER BY 1 );
+f
+DROP TABLE t1, t2;
+#
 # MDEV-9489: Assertion `0' failed in Protocol::end_statement() on
 # UNION ALL
 #

mysql-test/suite/galera/disabled.def

@@ -9,18 +9,15 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-MW-336 : MDEV-13549 Galera test failures
 galera_gra_log : MDEV-13549 Galera test failures
 galera_flush_local : MDEV-13549 Galera test failures
 galera_flush :  MDEV-13549 Galera test failures
-MW-329 : MDEV-13549 Galera test failures
 galera_account_management : MariaDB 10.0 does not support ALTER USER
 galera_binlog_row_image : MariaDB 10.0 does not support binlog_row_image
 galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events
 GAL-419 : MDEV-13549 Galera test failures
 galera_toi_ddl_fk_insert : MDEV-13549 Galera test failures
 galera_var_notify_cmd : MDEV-13549 Galera test failures
-galera_var_slave_threads : MDEV-13549 Galera test failures
 mysql-wsrep#90 : MDEV-13549 Galera test failures
 galera_as_master_gtid : Requires MySQL GTID
 galera_as_master_gtid_change_master : Requires MySQL GTID
@@ -34,7 +31,6 @@ galera_ist_mysqldump : MDEV-13549 Galera test failures
 mysql-wsrep#31 :  MDEV-13549 Galera test failures
 galera_migrate : MariaDB 10.0 does not support START SLAVE USER
 galera_concurrent_ctas : MDEV-13549 Galera test failures
-galera_bf_abort_for_update : MDEV-13549 Galera test failures
 galera_wsrep_desync_wsrep_on : MDEV-13549 Galera test failures
 galera_ssl_upgrade : MDEV-13549 Galera test failures
 mysql-wsrep#33 : MDEV-13549 Galera test failures
@@ -47,8 +43,6 @@ lp1376747 : MDEV-13549 Galera test failures
 galera_toi_ddl_nonconflicting : MDEV-13549 Galera test failures
 galera_parallel_simple : MDEV-13549 Galera test failures
 galera_admin : MDEV-13549 Galera test failures
-galera_var_max_ws_rows :  MDEV-13549 Galera test failures 10.1
-MW-286 : MDEV-13549 Galera test failures 10.1
 galera_as_master: MDEV-13549 Galera test failures 10.1
 galera_pc_ignore_sb : MDEV-13549 Galera test failures 10.1
 galera_lock_table : MDEV-13549 Galera test failures 10.1

mysql-test/suite/galera/r/MW-336.result

@@ -1,16 +1,14 @@
 CREATE TABLE t1 (f1 INTEGER) Engine=InnoDB;
+connection node_1;
 SET GLOBAL wsrep_slave_threads = 10;
 SET GLOBAL wsrep_slave_threads = 1;
+connection node_2;
 INSERT INTO t1 VALUES (1);
+connection node_1;
 SET GLOBAL wsrep_slave_threads = 10;
-SELECT COUNT(*) = 11 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
-COUNT(*) = 11
-1
 SET GLOBAL wsrep_slave_threads = 20;
-SELECT COUNT(*) = 21 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
-COUNT(*) = 21
-1
 SET GLOBAL wsrep_slave_threads = 1;
+connection node_2;
 INSERT INTO t1 VALUES (1);
 INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (3);
@@ -20,10 +18,12 @@ INSERT INTO t1 VALUES (6);
 INSERT INTO t1 VALUES (7);
 INSERT INTO t1 VALUES (8);
 INSERT INTO t1 VALUES (9);
+connection node_1;
 SET GLOBAL wsrep_slave_threads = 10;
 SET GLOBAL wsrep_slave_threads = 0;
 Warnings:
 Warning	1292	Truncated incorrect wsrep_slave_threads value: '0'
+connection node_2;
 INSERT INTO t1 VALUES (10);
 INSERT INTO t1 VALUES (11);
 INSERT INTO t1 VALUES (12);
@@ -35,8 +35,6 @@ INSERT INTO t1 VALUES (17);
 INSERT INTO t1 VALUES (18);
 INSERT INTO t1 VALUES (19);
 INSERT INTO t1 VALUES (20);
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
-COUNT(*) = 2
-1
+connection node_1;
 SET GLOBAL wsrep_slave_threads = 1;
 DROP TABLE t1;

mysql-test/suite/galera/r/galera_bf_abort_for_update.result

@@ -1,10 +1,29 @@
-CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 VALUES (1);
-INSERT INTO t1 VALUES (1);
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1, 10);
+connection node_1;
+BEGIN;
 SELECT * FROM t1 FOR UPDATE;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-wsrep_local_aborts_increment
+f1	f2
+1	10
+connection node_2;
+UPDATE t1 SET f1 = 2;
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connection node_1;
+COMMIT;
+ERROR 40001: Deadlock: wsrep aborted transaction
+wsrep_local_bf_aborts_diff
+1
+connection node_1;
+BEGIN;
+SELECT * FROM t1 FOR UPDATE;
+f1	f2
+2	10
+connection node_2;
+UPDATE t1 SET f2 = 20;
+connection node_1a;
+connection node_1;
+COMMIT;
+ERROR 40001: Deadlock: wsrep aborted transaction
+wsrep_local_bf_aborts_diff
 1
 DROP TABLE t1;

mysql-test/suite/galera/r/galera_var_slave_threads.result

@@ -1,8 +1,8 @@
-CALL mtr.add_suppression("WSREP: Refusing exit for the last slave thread.");
 connection node_1;
 CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=InnoDB;
 CREATE TABLE t2 (f1 INT AUTO_INCREMENT PRIMARY KEY) Engine=InnoDB;
 connection node_2;
+CALL mtr.add_suppression("WSREP: Refusing exit for the last slave thread.");
 SET GLOBAL wsrep_slave_threads = 0;
 Warnings:
 Warning	1292	Truncated incorrect wsrep_slave_threads value: '0'
@@ -13,27 +13,13 @@ SELECT @@wsrep_slave_threads = 1;
 @@wsrep_slave_threads = 1
 1
 SET GLOBAL wsrep_slave_threads = 1;
-SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
-WHERE USER = 'system user' AND STATE NOT LIKE 'InnoDB%';
-COUNT(*)
-2
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
 COUNT(*)
 1
 SET GLOBAL wsrep_slave_threads = 64;
 connection node_1;
 INSERT INTO t1 VALUES (1);
 connection node_2;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-1
-SELECT COUNT(*) - @@wsrep_slave_threads FROM INFORMATION_SCHEMA.PROCESSLIST
-WHERE USER = 'system user' AND STATE NOT LIKE 'InnoDB%';
-COUNT(*) - @@wsrep_slave_threads
-1
-SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
-COUNT(*)
-1
 SET GLOBAL wsrep_slave_threads = 1;
 connection node_1;
 INSERT INTO t2 VALUES (DEFAULT);
@@ -104,10 +90,6 @@ connection node_2;
 SELECT COUNT(*) FROM t2;
 COUNT(*)
 64
-SELECT COUNT(*) - @@wsrep_slave_threads FROM INFORMATION_SCHEMA.PROCESSLIST
-WHERE USER = 'system user' AND STATE NOT LIKE 'InnoDB%';
-COUNT(*) - @@wsrep_slave_threads
-1
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
 COUNT(*)
 1
@@ -122,5 +104,13 @@ CREATE TABLE t1 (i INT AUTO_INCREMENT PRIMARY KEY) ENGINE=INNODB;
 connection node_2;
 SET GLOBAL wsrep_slave_threads = 4;
 SET GLOBAL wsrep_slave_threads = 1;
+connection node_1;
+INSERT INTO t1 VALUES (DEFAULT);
+INSERT INTO t1 VALUES (DEFAULT);
+INSERT INTO t1 VALUES (DEFAULT);
 DROP TABLE t1;
+connection node_2;
+SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
+COUNT(*) = 1
+1
 # End of tests

mysql-test/suite/galera/t/MW-286.test

@@ -25,7 +25,6 @@ SET wsrep_on = FALSE;
 --error ER_QUERY_INTERRUPTED
 ALTER TABLE t1 ADD PRIMARY KEY (f1);
 
-SET SESSION wsrep_sync_wait = 0;
 SET wsrep_on = TRUE;
 SET GLOBAL wsrep_desync = FALSE;
 

mysql-test/suite/galera/t/MW-336.test

@@ -10,20 +10,20 @@ CREATE TABLE t1 (f1 INTEGER) Engine=InnoDB;
 --connection node_1
 SET GLOBAL wsrep_slave_threads = 10;
 SET GLOBAL wsrep_slave_threads = 1;
+--let $wait_condition = SELECT COUNT(*) = 11 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%');
+--source include/wait_condition.inc
 
 --connection node_2
 INSERT INTO t1 VALUES (1);
 
 --connection node_1
---sleep 0.5
 SET GLOBAL wsrep_slave_threads = 10;
---sleep 0.5
-SELECT COUNT(*) = 11 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+--let $wait_condition = SELECT COUNT(*) = 11 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%');
+--source include/wait_condition.inc
 
 SET GLOBAL wsrep_slave_threads = 20;
---sleep 0.5
-SELECT COUNT(*) = 21 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
-
+--let $wait_condition = SELECT COUNT(*) = 21 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%');
+--source include/wait_condition.inc
 
 SET GLOBAL wsrep_slave_threads = 1;
 
@@ -40,6 +40,9 @@ INSERT INTO t1 VALUES (9);
 
 
 --connection node_1
+--let $wait_condition = SELECT COUNT(*) = 12 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%');
+--source include/wait_condition.inc
+
 SET GLOBAL wsrep_slave_threads = 10;
 SET GLOBAL wsrep_slave_threads = 0;
 
@@ -57,8 +60,8 @@ INSERT INTO t1 VALUES (19);
 INSERT INTO t1 VALUES (20);
 
 --connection node_1
---sleep 0.5
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+--let $wait_condition = SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%');
+--source include/wait_condition.inc
 
 SET GLOBAL wsrep_slave_threads = 1;
 DROP TABLE t1;