From 18830d78a3796076747278afe9c85b48531f8f9c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 13 Mar 2014 16:34:34 +0100 Subject: mtr: move if(unix_socket) test to include/have_unix_socket.inc --- mysql-test/suite/plugins/t/unix_socket.test | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'mysql-test/suite/plugins') diff --git a/mysql-test/suite/plugins/t/unix_socket.test b/mysql-test/suite/plugins/t/unix_socket.test index fc2e6c5b3c6..3ce1d0323fb 100644 --- a/mysql-test/suite/plugins/t/unix_socket.test +++ b/mysql-test/suite/plugins/t/unix_socket.test @@ -1,8 +1,4 @@ ---source include/not_embedded.inc - -if (!$AUTH_SOCKET_SO) { - skip No auth_socket plugin; -} +--source include/have_unix_socket.inc let $plugindir=`SELECT @@global.plugin_dir`; -- cgit v1.2.1 From ded448d1d035d211c8146141546a08126bb728b6 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 26 Mar 2014 21:58:27 +0200 Subject: MDEV-5905: Creating tmp. memory table kills the server The reason was that a couple of variables that hold number of rows that was used to calculate buffers was uint and caused an overflow. Fixed by changing variables that could hold number of rows from uint to ulong and also added a cast for this test. include/heap.h: Reorder to get better alignment. Changed variables that could hold number of rows from uint to ulong mysql-test/suite/heap/heap.result: Added test case mysql-test/suite/heap/heap.test: Added test case mysql-test/suite/plugins/t/server_audit.test: Added sleep as we want to have disconnect logged before we try a new connect storage/heap/ha_heap.cc: Changed variables that could hold number of rows from uint to ulong Limit number of rows to 4G (as most of the variables that holds rows are ulong anyway) reset records_changed when key_stat_version is changed to not cause increments for every row changed storage/heap/ha_heap.h: changed records_changed to ulong as this can get big storage/heap/hp_create.c: Changed variables that could hold number of rows from uint to ulong Added cast (fixed the original bug) storage/heap/hp_delete.c: Changed variables that could hold number of rows from uint to ulong storage/heap/hp_open.c: Removed not needed cast storage/heap/hp_write.c: Changed variables that could hold number of rows from uint to ulong support-files/compiler_warnings.supp: Removed extra : from supression --- mysql-test/suite/plugins/t/server_audit.test | 1 + 1 file changed, 1 insertion(+) (limited to 'mysql-test/suite/plugins') diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test index f62980259c0..f63c8022392 100644 --- a/mysql-test/suite/plugins/t/server_audit.test +++ b/mysql-test/suite/plugins/t/server_audit.test @@ -14,6 +14,7 @@ set global server_audit_logging=on; connect (con1,localhost,root,,mysql); connection default; disconnect con1; +--sleep 2 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error ER_ACCESS_DENIED_ERROR connect (con1,localhost,no_such_user,,mysql); -- cgit v1.2.1