← Back to branch summary

~ubuntu-branches/ubuntu/maverick/mysql-5.1/maverick-proposed

« back to all changes in this revision

Viewing changes to sql/item_buff.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 14:16:05 UTC
  • mto: This revision was merged to the branch mainline in revision 20.
  • Revision ID: package-import@ubuntu.com-20120222141605-nxlu9yzc6attylc2
Tags: upstream-5.1.61
Import upstream version 5.1.61

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/item_buff.cc
1
 
/* Copyright (C) 2000-2006 MySQL AB
 
1
/*
 
2
   Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
2
3
 
3
4
   This program is free software; you can redistribute it and/or modify
4
5
   it under the terms of the GNU General Public License as published by
11
12
 
12
13
   You should have received a copy of the GNU General Public License
13
14
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
15
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
16
*/
15
17
 
16
18
 
17
19
/**
58
60
*/
59
61
 
60
62
Cached_item_str::Cached_item_str(THD *thd, Item *arg)
61
 
  :item(arg), value(min(arg->max_length, thd->variables.max_sort_length))
 
63
  :item(arg),
 
64
   value_max_length(min(arg->max_length, thd->variables.max_sort_length)),
 
65
   value(value_max_length)
62
66
{}
63
67
 
64
68
bool Cached_item_str::cmp(void)
67
71
  bool tmp;
68
72
 
69
73
  if ((res=item->val_str(&tmp_value)))
70
 
    res->length(min(res->length(), value.alloced_length()));
 
74
    res->length(min(res->length(), value_max_length));
71
75
  if (null_value != item->null_value)
72
76
  {
73
77
    if ((null_value= item->null_value))