← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

Merged from Felipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
984
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
 
      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
 
987
      push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
988
988
                          ER_CRASHED_ON_USAGE,
989
989
                          _("Found incompatible DECIMAL field '%s' in %s; "
990
990
                          "Please do \"ALTER TABLE '%s' FORCE\" to fix it!"),
1162
1162
                            "Please do \"ALTER TABLE '%s' FORCE \" to fix it!"),
1163
1163
                            share->table_name.str,
1164
1164
                            share->table_name.str);
1165
 
            push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
 
1165
            push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
1166
1166
                                ER_CRASHED_ON_USAGE,
1167
1167
                                _("Found wrong key definition in %s; "
1168
1168
                                "Please do \"ALTER TABLE '%s' FORCE\" to fix "