← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Monty Taylor
  • Date: 2008-07-31 20:54:55 UTC
  • mfrom: (243 drizzle)
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 244.
  • Revision ID: monty@inaugust.com-20080731205455-w5c7bplk91v2o1qb
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
1270
1270
    {
1271
1271
      Field_string *field= new Field_string(tbl->file->ref_length, 0,
1272
1272
                                            tbl->alias, &my_charset_bin);
 
1273
#ifdef OLD
 
1274
      Field_varstring *field= new Field_varstring(tbl->file->ref_length, 0,
 
1275
                                                  tbl->alias, tbl->s, &my_charset_bin);
 
1276
#endif
1273
1277
      if (!field)
1274
1278
        return(1);
1275
1279
      field->init(tbl);
1277
1281
        The field will be converted to varstring when creating tmp table if
1278
1282
        table to be updated was created by mysql 4.1. Deny this.
1279
1283
      */
1280
 
      field->can_alter_field_type= 0;
1281
1284
      Item_field *ifield= new Item_field((Field *) field);
1282
1285
      if (!ifield)
1283
1286
         return(1);