diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-19 12:26:09 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-19 12:26:09 -0700 |
| commit | 8ec03d805d1d7e478a8feb37a7486ebc2dd6a630 (patch) | |
| tree | b279f04290c79f9bea4273adf90588be0d993032 /sql/item_func.cc | |
| parent | 6d2da324613a299668933958e3a991168e0abab7 (diff) | |
| download | mariadb-git-8ec03d805d1d7e478a8feb37a7486ebc2dd6a630.tar.gz | |
Fixed crashes in the rpl suite due to a bug in Item_func_set_user_var::fix_fields.
Adjusted the result files in the pbxt, innodb and innodb_plugin suites.
Commented out a failing test case in innodb.innodb_multi_update.test.
It should be returned back when the problem with multi-update of derived
tables (bug 784297) is resolved.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 5090120e3f9..f55ecdd42f5 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3906,6 +3906,7 @@ bool Item_func_set_user_var::fix_fields(THD *thd, Item **ref) entry->collation.set(args[0]->collation.collation, DERIVATION_IMPLICIT); collation.set(entry->collation.collation, DERIVATION_IMPLICIT); cached_result_type= args[0]->result_type(); + if (thd->lex->current_select) { /* When this function is used in a derived table/view force the derived |