diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-28 13:36:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-28 13:36:05 +0100 |
| commit | 87de27e46b889d86cd872adf8ce613128d379911 (patch) | |
| tree | 87f3ec6d65538b9bc199408f58daaa2ec9e7a702 /sql/item_row.cc | |
| parent | f08a404a6d87f7c8c7fef1862eaf768cf920677b (diff) | |
| parent | 34e84c227f1cb76771eabf229b4cf1b5292eef25 (diff) | |
| download | mariadb-git-87de27e46b889d86cd872adf8ce613128d379911.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/item_row.cc')
| -rw-r--r-- | sql/item_row.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_row.cc b/sql/item_row.cc index cfd2f34095c..ee7bd837553 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -74,7 +74,8 @@ bool Item_row::fix_fields(THD *thd, Item **ref) Item **arg, **arg_end; for (arg= items, arg_end= items+arg_count; arg != arg_end ; arg++) { - if ((*arg)->fix_fields(thd, arg)) + if (!(*arg)->fixed && + (*arg)->fix_fields(thd, arg)) return TRUE; // we can't assign 'item' before, because fix_fields() can change arg Item *item= *arg; |