diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-28 12:04:46 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-28 12:04:46 -0700 |
| commit | 10986dba1bba289b8d8c3eee5335b5c38519bc6a (patch) | |
| tree | 675a7b0633fac6b75afa449d51ac52b7e6c6184a /sql/opt_range.cc | |
| parent | 19103bf364396d7a87581fb1faf01b70b852a46c (diff) | |
| parent | d2f7623d4525adcd7216ad2a0fad04fdc2e8495d (diff) | |
| download | mariadb-git-10986dba1bba289b8d8c3eee5335b5c38519bc6a.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
sql/opt_range.cc:
Auto merged
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index fef32dbb69d..3226dc9607b 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -3703,7 +3703,7 @@ get_mm_leaf(PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part, /* We need to restore the runtime mem_root of the thread in this - function becuase it evaluates the value of its argument, while + function because it evaluates the value of its argument, while the argument can be any, e.g. a subselect. The subselect items, in turn, assume that all the memory allocated during the evaluation has the same life span as the item itself. |