← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

  • Committer: Brian Aker
  • Date: 2010-11-22 00:16:44 UTC
  • mto: (1945.2.1 quick)
  • mto: This revision was merged to the branch mainline in revision 1947.
  • Revision ID: brian@tangent.org-20101122001644-pi6jv0d65e82xn38
Merge in lock refactor, this just encapsulates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
16
 
17
17
/**
721
721
  }
722
722
 
723
723
  if (error > 0)
 
724
  {
724
725
    make_truncated_value_warning(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
725
726
                                 str->ptr(), str->length(),
726
727
                                 warn_type, warn_name);
 
728
  }
727
729
 
728
730
  return value;
729
731
}
762
764
*/
763
765
 
764
766
enum Arg_comparator::enum_date_cmp_type
765
 
Arg_comparator::can_compare_as_dates(Item *a, Item *b, uint64_t *const_value)
 
767
Arg_comparator::can_compare_as_dates(Item *in_a, Item *in_b,
 
768
                                     uint64_t *const_value)
766
769
{
767
770
  enum enum_date_cmp_type cmp_type= CMP_DATE_DFLT;
768
771
  Item *str_arg= 0, *date_arg= 0;
769
772
 
770
 
  if (a->type() == Item::ROW_ITEM || b->type() == Item::ROW_ITEM)
 
773
  if (in_a->type() == Item::ROW_ITEM || in_b->type() == Item::ROW_ITEM)
771
774
    return CMP_DATE_DFLT;
772
775
 
773
 
  if (a->is_datetime())
 
776
  if (in_a->is_datetime())
774
777
  {
775
 
    if (b->is_datetime())
 
778
    if (in_b->is_datetime())
776
779
      cmp_type= CMP_DATE_WITH_DATE;
777
 
    else if (b->result_type() == STRING_RESULT)
 
780
    else if (in_b->result_type() == STRING_RESULT)
778
781
    {
779
782
      cmp_type= CMP_DATE_WITH_STR;
780
 
      date_arg= a;
781
 
      str_arg= b;
 
783
      date_arg= in_a;
 
784
      str_arg= in_b;
782
785
    }
783
786
  }
784
 
  else if (b->is_datetime() && a->result_type() == STRING_RESULT)
 
787
  else if (in_b->is_datetime() && in_a->result_type() == STRING_RESULT)
785
788
  {
786
789
    cmp_type= CMP_STR_WITH_DATE;
787
 
    date_arg= b;
788
 
    str_arg= a;
 
790
    date_arg= in_b;
 
791
    str_arg= in_a;
789
792
  }
790
793
 
791
794
  if (cmp_type != CMP_DATE_DFLT)
2032
2035
    ge_cmp.set_datetime_cmp_func(args, args + 1);
2033
2036
    le_cmp.set_datetime_cmp_func(args, args + 2);
2034
2037
  }
2035
 
  else if (args[0]->real_item()->type() == FIELD_ITEM &&
2036
 
           session->lex->sql_command != SQLCOM_SHOW_CREATE)
 
2038
  else if (args[0]->real_item()->type() == FIELD_ITEM)
2037
2039
  {
2038
2040
    Item_field *field_item= (Item_field*) (args[0]->real_item());
2039
2041
    if (field_item->field->can_be_compared_as_int64_t())
3675
3677
        comparison type accordingly.
3676
3678
      */
3677
3679
      if (args[0]->real_item()->type() == FIELD_ITEM &&
3678
 
          session->lex->sql_command != SQLCOM_SHOW_CREATE &&
3679
3680
          cmp_type != INT_RESULT)
3680
3681
      {
3681
3682
        Item_field *field_item= (Item_field*) (args[0]->real_item());
5099
5100
  while ((item_field= it++))
5100
5101
  {
5101
5102
    /* Skip fields of non-const tables. They haven't been read yet */
5102
 
    if (item_field->field->table->const_table)
 
5103
    if (item_field->field->getTable()->const_table)
5103
5104
    {
5104
5105
      if ((null_value= item_field->null_value) || eval_item->cmp(item_field))
5105
5106
        return 0;