← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/viosocket.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/viosocket.cc
118
118
{
119
119
  int r=0;
120
120
 
121
 
  *old_mode= test(!(vio->fcntl_mode & O_NONBLOCK));
 
121
  *old_mode= drizzled::test(!(vio->fcntl_mode & O_NONBLOCK));
122
122
 
123
123
  if (vio->sd >= 0)
124
124
  {