← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Monty Taylor
  • Date: 2008-08-04 19:45:27 UTC
  • mto: (261.2.2 codestyle)
  • mto: This revision was merged to the branch mainline in revision 262.
  • Revision ID: monty@inaugust.com-20080804194527-gmcepj2kyqxwh51s
Made the ER() macro always gettext the return value.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
543
543
    if (use_mb(default_charset_info))
544
544
    {
545
545
      /* Warn that we may be changing the size of character columns */
546
 
      sql_print_warning("'%s' had no or invalid character set, "
 
546
      sql_print_warning(_("'%s' had no or invalid character set, "
547
547
                        "and default character set is multi-byte, "
548
 
                        "so character column sizes may have changed",
 
548
                        "so character column sizes may have changed"),
549
549
                        share->path.str);
550
550
    }
551
551
    share->table_charset= default_charset_info;
980
980
      field_length= my_decimal_precision_to_length(field_length,
981
981
                                                   decimals,
982
982
                                                   f_is_dec(pack_flag) == 0);
983
 
      sql_print_error("Found incompatible DECIMAL field '%s' in %s; "
984
 
                      "Please do \"ALTER TABLE '%s' FORCE\" to fix it!",
 
983
      sql_print_error(_("Found incompatible DECIMAL field '%s' in %s; "
 
984
                      "Please do \"ALTER TABLE '%s' FORCE\" to fix it!"),
985
985
                      share->fieldnames.type_names[i], share->table_name.str,
986
986
                      share->table_name.str);
987
987
      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
988
988
                          ER_CRASHED_ON_USAGE,
989
 
                          "Found incompatible DECIMAL field '%s' in %s; "
990
 
                          "Please do \"ALTER TABLE '%s' FORCE\" to fix it!",
 
989
                          _("Found incompatible DECIMAL field '%s' in %s; "
 
990
                          "Please do \"ALTER TABLE '%s' FORCE\" to fix it!"),
991
991
                          share->fieldnames.type_names[i],
992
992
                          share->table_name.str,
993
993
                          share->table_name.str);
1158
1158
            key_part->store_length-= (uint16_t)(key_part->length -
1159
1159
                                              field->key_length());
1160
1160
            key_part->length= (uint16_t)field->key_length();
1161
 
            sql_print_error("Found wrong key definition in %s; "
1162
 
                            "Please do \"ALTER TABLE '%s' FORCE \" to fix it!",
 
1161
            sql_print_error(_("Found wrong key definition in %s; "
 
1162
                            "Please do \"ALTER TABLE '%s' FORCE \" to fix it!"),
1163
1163
                            share->table_name.str,
1164
1164
                            share->table_name.str);
1165
1165
            push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
1166
1166
                                ER_CRASHED_ON_USAGE,
1167
 
                                "Found wrong key definition in %s; "
 
1167
                                _("Found wrong key definition in %s; "
1168
1168
                                "Please do \"ALTER TABLE '%s' FORCE\" to fix "
1169
 
                                "it!",
 
1169
                                "it!"),
1170
1170
                                share->table_name.str,
1171
1171
                                share->table_name.str);
1172
1172
            share->crashed= 1;                // Marker for CHECK TABLE