← Back to branch summary

~skinny.moey/drizzle/innodb-replication

« back to all changes in this revision

Viewing changes to drizzled/function/func.cc

  • Committer: Brian Aker
  • Date: 2010-11-08 22:35:57 UTC
  • mfrom: (1802.1.114 trunk)
  • Revision ID: brian@tangent.org-20101108223557-w3xzwp9hjjtjhtc1
Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/func.cc
622
622
 
623
623
void Item_func::signal_divide_by_null()
624
624
{
625
 
  push_warning(getSessionPtr(), DRIZZLE_ERROR::WARN_LEVEL_ERROR, ER_DIVISION_BY_ZERO, ER(ER_DIVISION_BY_ZERO));
626
 
  null_value= 1;
 
625
  my_error(ER_DIVISION_BY_ZERO, MYF(0));
 
626
  null_value= 0;
627
627
}
628
628
 
629
629