Automatic merge

8 files changed, 103 insertions, 9 deletions

diff --git a/mysql-test/r/handlersocket.result b/mysql-test/r/handlersocket.result
index dcea3c186b6..a415b12f92d 100644
--- a/mysql-test/r/handlersocket.result
+++ b/mysql-test/r/handlersocket.result
@@ -1,13 +1,14 @@
 install plugin handlersocket soname 'handlersocket.so';
-select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket';
+select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description, plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket';
 plugin_name	handlersocket
 plugin_version	1.0
 plugin_status	ACTIVE
 plugin_type	DAEMON
 plugin_library	handlersocket.so
-plugin_library_version	0.0
+plugin_library_version	1.3
 plugin_author	higuchi dot akira at dena dot jp
-plugin_license	
-plugin_maturity	Unknown
-plugin_auth_version	Unknown
+plugin_description	Direct access into InnoDB
+plugin_license	BSD
+plugin_maturity	Beta
+plugin_auth_version	1.0
 uninstall plugin handlersocket;
diff --git a/mysql-test/suite/innodb/t/innodb_bug60196.test b/mysql-test/suite/innodb/t/innodb_bug60196.test
index 328c886351e..e479b8d6b82 100755
--- a/mysql-test/suite/innodb/t/innodb_bug60196.test
+++ b/mysql-test/suite/innodb/t/innodb_bug60196.test
@@ -78,7 +78,8 @@ SELECT * FROM Bug_60196;
 INSERT INTO Bug_60196 VALUES (2, 1);
 INSERT INTO Bug_60196 VALUES (2, 2);
 INSERT INTO Bug_60196 VALUES (2, 3);
-SELECT * FROM Bug_60196 ORDER BY FK1_Key, FK2_Key;
+--sorted_result
+SELECT * FROM Bug_60196;
 
 --echo
 --echo # Clean up.
diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result
index c68a8871f83..888c1c10c5e 100644
--- a/mysql-test/suite/maria/maria.result
+++ b/mysql-test/suite/maria/maria.result
@@ -2542,8 +2542,12 @@ drop table t1;
 create table t1 (a int) engine=aria transactional=1;
 insert into t1 values (1);
 lock table t1 write concurrent;
-delete from t1;
+delete from t1 where a>0;
 ERROR 42000: The storage engine for the table doesn't support DELETE in WRITE CONCURRENT
+delete from t1;
+ERROR 42000: The storage engine for the table doesn't support TRUNCATE in WRITE CONCURRENT
+truncate t1;
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
 unlock tables;
 drop table t1;
 create table t1 (p int primary key, i int, a char(10), key k1(i), key k2(a))
diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test
index b371394b2b3..6ebcf08d952 100644
--- a/mysql-test/suite/maria/maria.test
+++ b/mysql-test/suite/maria/maria.test
@@ -1805,7 +1805,11 @@ insert into t1 values (1);
 lock table t1 write concurrent;
 # should be fixed with fully implemented versioning
 --error ER_CHECK_NOT_IMPLEMENTED
+delete from t1 where a>0;
+--error ER_CHECK_NOT_IMPLEMENTED
 delete from t1;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+truncate t1;
 unlock tables;
 drop table t1;
 
diff --git a/mysql-test/suite/maria/truncate.result b/mysql-test/suite/maria/truncate.result
new file mode 100644
index 00000000000..467e0f915dd
--- /dev/null
+++ b/mysql-test/suite/maria/truncate.result
@@ -0,0 +1,37 @@
+CREATE TABLE t1 ( i INT ) ENGINE=Aria PARTITION BY HASH(i) PARTITIONS 2;
+SET AUTOCOMMIT = 0;
+TRUNCATE TABLE t1;
+DROP TABLE t1;
+CREATE TABLE t1 ( i INT ) ENGINE=Aria;
+CREATE TABLE t2 ( i INT ) ENGINE=Aria;
+insert into t1 values(1);
+lock table t1 write;
+truncate table t1;
+select count(*) from t1;
+count(*)
+0
+insert into t1 values(2);
+select count(*) from t1;
+count(*)
+1
+truncate table t1;
+select count(*) from t1;
+count(*)
+0
+insert into t1 values(3);
+select count(*) from t1;
+count(*)
+1
+select * from t2;
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+unlock tables;
+insert into t1 values(4);
+select * from t1;
+i
+3
+4
+truncate t1;
+select count(*) from t1;
+count(*)
+0
+drop table t1,t2;
diff --git a/mysql-test/suite/maria/truncate.test b/mysql-test/suite/maria/truncate.test
new file mode 100644
index 00000000000..3d6e70d9db6
--- /dev/null
+++ b/mysql-test/suite/maria/truncate.test
@@ -0,0 +1,47 @@
+#
+# Testing of potential problems in Aria
+#
+
+-- source include/have_maria.inc
+-- source include/have_partition.inc
+
+--disable_warnings
+--disable_query_log
+drop table if exists t1,t2;
+--enable_query_log
+--enable_warnings
+
+#
+# LP:997460 truncate table on partitioned Aria table fails with ER_ILLEGAL_HA
+#
+
+CREATE TABLE t1 ( i INT ) ENGINE=Aria PARTITION BY HASH(i) PARTITIONS 2;
+SET AUTOCOMMIT = 0;
+TRUNCATE TABLE t1;
+DROP TABLE t1;
+
+#
+# Other truncate tests
+#
+
+CREATE TABLE t1 ( i INT ) ENGINE=Aria;
+CREATE TABLE t2 ( i INT ) ENGINE=Aria;
+insert into t1 values(1);
+lock table t1 write;
+truncate table t1;
+select count(*) from t1;
+insert into t1 values(2);
+select count(*) from t1;
+truncate table t1;
+select count(*) from t1;
+insert into t1 values(3);
+select count(*) from t1;
+# Check that locking is still working
+--error 1100
+select * from t2;
+unlock tables;
+insert into t1 values(4);
+select * from t1;
+truncate t1;
+select count(*) from t1;
+drop table t1,t2;
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
index 78489449ab8..e736eb1ba12 100644
--- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
@@ -324,7 +324,7 @@ call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received w
 let $slave_errno= ER_DUP_ENTRY
 --source include/wait_for_slave_sql_error.inc
 let $rcvd_heartbeats_before= query_get_value(SHOW STATUS LIKE 'slave_received_heartbeats', Value, 1);
-sleep 2;
+sleep 4;
 let $rcvd_heartbeats_after= query_get_value(SHOW STATUS LIKE 'slave_received_heartbeats', Value, 1);
 let $result= query_get_value(SELECT ($rcvd_heartbeats_after - $rcvd_heartbeats_before) > 0 AS Result, Result, 1);
 --echo Heartbeat events are received while sql thread stopped (1 means 'yes'): $result
diff --git a/mysql-test/t/handlersocket.test b/mysql-test/t/handlersocket.test
index 6a7b65797c5..10cb9728fb7 100644
--- a/mysql-test/t/handlersocket.test
+++ b/mysql-test/t/handlersocket.test
@@ -5,6 +5,6 @@ if (`select length('$HANDLERSOCKET_SO') = 0`) {
 }
 
 install plugin handlersocket soname 'handlersocket.so';
---query_vertical select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket'
+--query_vertical select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description, plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket'
 uninstall plugin handlersocket;