← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/decimal.cc

  • Committer: lbieber
  • Date: 2010-10-08 01:11:05 UTC
  • mfrom: (1821.1.4 build)
  • Revision ID: lbieber@orisndriz08-20101008011105-1tbwbvz9me9fy7ua
Merge Monty - Fixed the last of the ICC warnings. Turned on warnings=errors
Merge Brian - fixu bug #655558: SELECT 102/(1-1) should error on divide by zero          
Merge Brian - fix bug #654219: information_schema.key_column_usage does not contain information about FKs

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/decimal.cc
157
157
                        "DECIMAL", "");
158
158
    break;
159
159
  case E_DEC_DIV_ZERO:
160
 
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
161
 
                        ER_DIVISION_BY_ZERO, ER(ER_DIVISION_BY_ZERO));
 
160
    my_error(ER_DIVISION_BY_ZERO, MYF(0));
162
161
    break;
163
162
  case E_DEC_BAD_NUM:
164
163
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_ERROR,