~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/insert_value.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
#include <drizzled/error.h>
22
22
#include <drizzled/name_resolution_context.h>
23
23
#include <drizzled/table.h>
83
83
  {
84
84
    Field *tmp_field= field_arg->field;
85
85
    /* charset doesn't matter here, it's to avoid sigsegv only */
86
 
    tmp_field= new Field_null(0, 0, field_arg->field->field_name);
 
86
    tmp_field= new Field_null(0, 0, field_arg->field->field_name, &my_charset_bin);
87
87
    if (tmp_field)
88
88
    {
89
89
      tmp_field->init(field_arg->field->getTable());
94
94
}
95
95
 
96
96
 
97
 
void Item_insert_value::print(String *str)
 
97
void Item_insert_value::print(String *str, enum_query_type query_type)
98
98
{
99
99
  str->append(STRING_WITH_LEN("values("));
100
 
  arg->print(str);
 
100
  arg->print(str, query_type);
101
101
  str->append(')');
102
102
}
103
103