diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/handlersocket.result | 11 | ||||
| -rwxr-xr-x | mysql-test/suite/innodb/t/innodb_bug60196.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_heartbeat_basic.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/handlersocket.test | 2 |
4 files changed, 9 insertions, 7 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 fcef3196845..423b6d3403e 100755 --- a/mysql-test/suite/innodb/t/innodb_bug60196.test +++ b/mysql-test/suite/innodb/t/innodb_bug60196.test @@ -77,6 +77,7 @@ 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); +--sorted_result SELECT * FROM Bug_60196; --echo 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; |