diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-08-26 20:23:48 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-08-26 20:23:48 +0300 |
| commit | 91dc31d38334cddc0b47c9ac0c0be338fc8cfd20 (patch) | |
| tree | cce35b98c6515a9259db42814c404cbc8e07856b /sql-common | |
| parent | c0cea540241be3d4cecd7c8481fac7213d228c11 (diff) | |
| download | mariadb-git-91dc31d38334cddc0b47c9ac0c0be338fc8cfd20.tar.gz | |
Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714)
mysql-test/r/olap.result:
new test case for bug
mysql-test/t/olap.test:
new test case for bug
sql-common/client.c:
Safety fix
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 222f0bf0288..25b18c27d8a 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -587,7 +587,7 @@ net_safe_read(MYSQL *mysql) DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %d", vio_description(net->vio),len)); #ifdef MYSQL_SERVER - if (socket_errno == SOCKET_EINTR) + if (vio_errno(net->vio) == SOCKET_EINTR) return (packet_error); #endif /*MYSQL_SERVER*/ end_server(mysql); |