diff options
| author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-14 23:33:50 +0300 |
|---|---|---|
| committer | Galina Shalygina <galashalygina@gmail.com> | 2016-05-14 23:33:50 +0300 |
| commit | 3b47632bfc74a548c2f0a057f39e99a8a761a57a (patch) | |
| tree | 88a61768be6280f0db62f1294c15307769a983f8 /sql/sql_union.cc | |
| parent | d9b332bd2009cc520534bb9413e2f50c717237aa (diff) | |
| download | mariadb-git-3b47632bfc74a548c2f0a057f39e99a8a761a57a.tar.gz | |
Fixed a bug that caused crashes for SHOW CREATE VIEW <view> when <view> was recursive. Added a test case to check the fix.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 902620aaac1..9308dc2a841 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -205,13 +205,13 @@ select_union_recursive::create_result_table(THD *thd_arg, { if (select_union::create_result_table(thd_arg, column_types, is_union_distinct, options, - alias, bit_fields_as_long, + "", bit_fields_as_long, create_table, keep_row_order)) return true; if (! (incr_table= create_tmp_table(thd_arg, &tmp_table_param, *column_types, (ORDER*) 0, false, 1, - options, HA_POS_ERROR, alias, + options, HA_POS_ERROR, "", !create_table, keep_row_order))) return true; |