Commit e4bec46e authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents da7087dd c351b5bf

mysql-test/r/grant2.result

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ Warnings: 
Warning	1265	Data truncated for column 'Alter_routine_priv' at row 1

FLUSH PRIVILEGES;

create database TEStdb;

ERROR 42000: Access denied for user 'mysqltest_1'@'%' to database 'TEStdb'

Got one of the listed errors

delete from mysql.user;

delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB';

insert into mysql.user select * from t1;

mysql-test/t/grant2.test

+2 −1
Original line number Diff line number Diff line
@@ -452,7 +452,8 @@ connect (con1,localhost,mysqltest_1,password,TESTDB); 


# The user mysqltest_1 should only be allowed access to

# database TESTDB, not TEStdb

--error 1044

# On system with "lowercase names" we get error "1007: Can't create db..."

--error 1044, 1007

create database TEStdb;



# Clean-up

sql/net_serv.cc

+25 −4
Original line number Diff line number Diff line
@@ -208,23 +208,40 @@ my_bool net_realloc(NET *net, ulong length) 
  RETURN VALUES

    0	No data to read

    1	Data or EOF to read

    -1  Don't know if data is ready or not

*/



static my_bool net_data_is_ready(my_socket sd)

static int net_data_is_ready(my_socket sd)

{

#ifdef HAVE_POLL

  struct pollfd ufds;

  int res;



  ufds.fd= sd;

  ufds.events= POLLIN | POLLPRI;

  if (!(res= poll(&ufds, 1, 0)))

    return 0;

  if (res < 0 || !(ufds.revents & (POLLIN | POLLPRI)))

    return 0;

  return 1;

#else

  fd_set sfds;

  struct timeval tv;

  int res;



  if (sd >= FD_SETSIZE)

    return -1;



  FD_ZERO(&sfds);

  FD_SET(sd, &sfds);



  tv.tv_sec= tv.tv_usec= 0;



  if ((res= select(sd+1, &sfds, NULL, NULL, &tv)) < 0)

    return FALSE;

    return 0;

  else

    return test(res ? FD_ISSET(sd, &sfds) : 0);

#endif

}
@@ -251,10 +268,10 @@ static my_bool net_data_is_ready(my_socket sd) 


void net_clear(NET *net)

{

  int count;

  int count, ready;

  DBUG_ENTER("net_clear");

#if !defined(EMBEDDED_LIBRARY)

  while(net_data_is_ready(net->vio->sd))

  while((ready= net_data_is_ready(net->vio->sd)) != 0)

  {

    /* The socket is ready */

    if ((count= vio_read(net->vio, (char*) (net->buff),
@@ -269,6 +286,10 @@ void net_clear(NET *net) 
    }

    else

    {

      /* No data to read and 'net_data_is_ready' returned "don't know" */

      if (ready == -1)

        break;



      DBUG_PRINT("info",("socket ready but only EOF to read - disconnected"));

      net->error= 2;

      break;