← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/linebuffer.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/linebuffer.cc
22
22
#include <vector>
23
23
 
24
24
using namespace std;
 
25
using namespace drizzled;
25
26
 
26
27
LineBuffer::LineBuffer(uint32_t my_max_size,FILE *my_file)
27
28
  :
44
45
 
45
46
  if (file && !eof)
46
47
  {
47
 
    if ((read_count= my_read(fileno(file),
 
48
    if ((read_count= internal::my_read(fileno(file),
48
49
                             (unsigned char *) (&line[0]),
49
50
                             max_size-1,MYF(MY_WME))))
50
51
    {