← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/insert_value.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/insert_value.cc
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());