← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/linebuffer.cc

  • Committer: Jay Pipes
  • Date: 2009-09-21 14:33:44 UTC
  • mfrom: (1126.10.26 dtrace-probes)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: jpipes@serialcoder-20090921143344-jnarp7gcn6zmg19c
Merge fixes from Trond and Padraig on dtrace probes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/linebuffer.cc
15
15
 
16
16
/* readline for batch mode */
17
17
 
18
 
#include "config.h"
19
 
#include "drizzled/internal/my_sys.h"
 
18
#include <drizzled/global.h>
 
19
#include <mysys/my_sys.h>
20
20
#include "client/linebuffer.h"
21
21
 
22
22
#include <vector>
23
23
 
24
24
using namespace std;
25
 
using namespace drizzled;
26
25
 
27
26
LineBuffer::LineBuffer(uint32_t my_max_size,FILE *my_file)
28
27
  :
45
44
 
46
45
  if (file && !eof)
47
46
  {
48
 
    if ((read_count= internal::my_read(fileno(file),
 
47
    if ((read_count= my_read(fileno(file),
49
48
                             (unsigned char *) (&line[0]),
50
49
                             max_size-1,MYF(MY_WME))))
51
50
    {