diff options
| author | Igor Babaev <igor@askmonty.org> | 2018-08-24 00:51:47 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2018-08-24 00:51:47 -0700 |
| commit | 6c6ca907ee84e3f129bc33be8202c0fee2f29196 (patch) | |
| tree | a24e1ec79fa8852ea7e91dd4b1dbd9d44ea54218 | |
| parent | 2c76653849c1729bedc213b233089bf361c82e12 (diff) | |
| download | mariadb-git-6c6ca907ee84e3f129bc33be8202c0fee2f29196.tar.gz | |
Correction for MDEV-16930.
| -rw-r--r-- | sql/sql_yacc.yy | 4 | ||||
| -rw-r--r-- | sql/sql_yacc_ora.yy | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 1ec731781a5..7ed44982dd6 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -13345,7 +13345,7 @@ values_with_names: if (unlikely(Lex->insert_list->push_back($4, thd->mem_root))) MYSQL_YYABORT; // give some name in case of using in table value constuctor (TVC) - if (!$4->name.str) + if (!$4->name.str || $4->name.str == item_empty_name) $4->set_name(thd, $3, (uint) ($5 - $3), thd->charset()); } | remember_name expr_or_default remember_end @@ -13353,7 +13353,7 @@ values_with_names: if (unlikely(Lex->insert_list->push_back($2, thd->mem_root))) MYSQL_YYABORT; // give some name in case of using in table value constuctor (TVC) - if (!$2->name.str) + if (!$2->name.str || $2->name.str == item_empty_name) $2->set_name(thd, $1, (uint) ($3 - $1), thd->charset()); } ; diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index a6446180fc0..8f98cfa3694 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -13500,7 +13500,7 @@ values_with_names: if (unlikely(Lex->insert_list->push_back($4, thd->mem_root))) MYSQL_YYABORT; // give some name in case of using in table value constuctor (TVC) - if (!$4->name.str) + if (!$4->name.str || $4->name.str == item_empty_name) $4->set_name(thd, $3, (uint) ($5 - $3), thd->charset()); } | remember_name expr_or_default remember_end @@ -13508,7 +13508,7 @@ values_with_names: if (unlikely(Lex->insert_list->push_back($2, thd->mem_root))) MYSQL_YYABORT; // give some name in case of using in table value constuctor (TVC) - if (!$2->name.str) + if (!$2->name.str || $2->name.str == item_empty_name) $2->set_name(thd, $1, (uint) ($3 - $1), thd->charset()); } ; |