← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ref.cc

  • Committer: Diego Medina
  • Date: 2009-10-05 04:05:29 UTC
  • mfrom: (1161 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ref.cc
23
23
#include <drizzled/error.h>
24
24
#include <drizzled/show.h>
25
25
#include <drizzled/item/ref.h>
 
26
#include <drizzled/plugin/client.h>
26
27
 
27
28
using namespace drizzled;
28
29
 
380
381
}
381
382
 
382
383
 
383
 
bool Item_ref::send(plugin::Protocol *prot, String *tmp)
 
384
bool Item_ref::send(plugin::Client *client, String *tmp)
384
385
{
385
386
  if (result_field)
386
 
    return prot->store(result_field);
387
 
  return (*ref)->send(prot, tmp);
 
387
    return client->store(result_field);
 
388
  return (*ref)->send(client, tmp);
388
389
}
389
390
 
390
391