← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/make_set.cc

Merge Stewart's dead code removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/make_set.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
22
22
#include <drizzled/function/str/make_set.h>
23
23
#include <drizzled/session.h>
24
24
 
25
 
namespace drizzled
26
 
{
27
 
 
28
25
void Item_func_make_set::update_used_tables()
29
26
{
30
27
  Item_func::update_used_tables();
34
31
}
35
32
 
36
33
 
37
 
void Item_func_make_set::split_sum_func(Session *session_arg, Item **ref_pointer_array,
 
34
void Item_func_make_set::split_sum_func(Session *session, Item **ref_pointer_array,
38
35
                                        List<Item> &fields)
39
36
{
40
 
  item->split_sum_func(session_arg, ref_pointer_array, fields, &item, true);
41
 
  Item_str_func::split_sum_func(session_arg, ref_pointer_array, fields);
 
37
  item->split_sum_func(session, ref_pointer_array, fields, &item, true);
 
38
  Item_str_func::split_sum_func(session, ref_pointer_array, fields);
42
39
}
43
40
 
44
41
 
124
121
    change records at each execution.
125
122
  */
126
123
  if (item != new_item)
127
 
    session.change_item_tree(&item, new_item);
128
 
 
 
124
    current_session->change_item_tree(&item, new_item);
129
125
  return Item_str_func::transform(transformer, arg);
130
126
}
131
127
 
142
138
  str->append(')');
143
139
}
144
140
 
145
 
} /* namespace drizzled */