summaryrefslogtreecommitdiff
path: root/mysql-test/r/shm.result
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-03-26 20:25:10 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-03-26 20:25:10 -0300
commit7c2612135f7c13e06819ea4be0e61d1283086b6a (patch)
tree263224e9efc11eab2f5fae7d03581c0e7a499a89 /mysql-test/r/shm.result
parent19e3c5c8e0b009a437f260da764cfc2cae501eba (diff)
parent96e02e57166a37f79c10f5f9afc1f9185e1110a7 (diff)
downloadmariadb-git-7c2612135f7c13e06819ea4be0e61d1283086b6a.tar.gz
Bug#33899: Deadlock in mysql_real_query with shared memory connections
The problem is that the read and write methods of the shared memory transport (protocol) didn't react to asynchornous close events, which could lead to a lock up as the client would wait (until time out) for a server response that will never come. The solution is to also wait for close events while waiting for I/O from or to the server. Bug report and patch submitted by: Armin Schöffmann
Diffstat (limited to 'mysql-test/r/shm.result')
-rw-r--r--mysql-test/r/shm.result7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/shm.result b/mysql-test/r/shm.result
index 36ab17c1e4d..c504fe222ef 100644
--- a/mysql-test/r/shm.result
+++ b/mysql-test/r/shm.result
@@ -2152,4 +2152,11 @@ Warnings:
Warning 1052 Column 'kundentyp' in group statement is ambiguous
drop table t1;
mysqld is alive
+SET @max_allowed_packet= @@global.max_allowed_packet;
+SET @net_buffer_length= @@global.net_buffer_length;
+SET GLOBAL max_allowed_packet= 1024;
+SET GLOBAL net_buffer_length= 1024;
+ERROR 1153 (08S01) at line 1: Got a packet bigger than 'max_allowed_packet' bytes
+SET GLOBAL max_allowed_packet= @max_allowed_packet;
+SET GLOBAL net_buffer_length= @net_buffer_length;
End of 5.0 tests.