← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to client/linebuffer.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/linebuffer.cc
45
45
 
46
46
  if (file && !eof)
47
47
  {
48
 
    if ((read_count= internal::my_read(fileno(file),
49
 
                             (unsigned char *) (&line[0]),
50
 
                             max_size-1,MYF(MY_WME))))
 
48
    if ((read_count= read(fileno(file), (&line[0]), max_size-1)))
51
49
    {
52
50
      line[read_count+1]= '\0';
53
51
      buffer << &line[0];