← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ref.cc

  • Committer: Monty Taylor
  • Date: 2009-08-17 18:46:08 UTC
  • mto: (1182.1.1 staging)
  • mto: This revision was merged to the branch mainline in revision 1183.
  • Revision ID: mordred@inaugust.com-20090817184608-0b2emowpjr9m6le7
"Fixed" the deadlock test. I'd still like someone to look at what's going on here.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ref.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
22
 
#include "drizzled/session.h"
23
 
#include "drizzled/error.h"
24
 
#include "drizzled/show.h"
25
 
#include "drizzled/item/ref.h"
26
 
#include "drizzled/plugin/client.h"
27
 
#include "drizzled/item/sum.h"
28
 
 
29
 
namespace drizzled
30
 
{
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
 
22
#include <drizzled/session.h>
 
23
#include <drizzled/error.h>
 
24
#include <drizzled/show.h>
 
25
#include <drizzled/item/ref.h>
31
26
 
32
27
Item_ref::Item_ref(Name_resolution_context *context_arg,
33
28
                   Item **item, const char *table_name_arg,
383
378
}
384
379
 
385
380
 
386
 
bool Item_ref::send(plugin::Client *client, String *tmp)
 
381
bool Item_ref::send(Protocol *prot, String *tmp)
387
382
{
388
383
  if (result_field)
389
 
    return client->store(result_field);
390
 
  return (*ref)->send(client, tmp);
 
384
    return prot->store(result_field);
 
385
  return (*ref)->send(prot, tmp);
391
386
}
392
387
 
393
388
 
576
571
    depended_from= NULL;
577
572
  }
578
573
}
579
 
 
580
 
} /* namespace drizzled */