summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2002-10-24 22:59:29 +0300
committerunknown <bell@sanja.is.com.ua>2002-10-24 22:59:29 +0300
commitc81300691327066b954fb34116f6d1f88e0d49d6 (patch)
tree658a0980e3a615083a4dccc117656f85888eeb8f /sql/sql_select.cc
parent372b26e7786dcc812bc5fd2e8541d8c58201ea5b (diff)
downloadmariadb-git-c81300691327066b954fb34116f6d1f88e0d49d6.tar.gz
fixed update with subselect (FOR REVIEW)
mysql-test/r/subselect.result: update with subselect test mysql-test/t/subselect.test: update with subselect test sql/mysql_priv.h: fixed update with subselect sql/sql_base.cc: fixed update with subselect sql/sql_lex.cc: fixed update with subselect sql/sql_select.cc: fixed update with subselect sql/sql_update.cc: fixed update with subselect sql/sql_yacc.yy: fixed update with subselect
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 6a48f56443c..c3cc4c1041c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -5641,6 +5641,9 @@ make_cond_for_table(COND *cond,table_map tables,table_map used_table)
static Item *
part_of_refkey(TABLE *table,Field *field)
{
+ if (!table->reginfo.join_tab)
+ return (Item*) 0; // field from outer non-select (UPDATE,...)
+
uint ref_parts=table->reginfo.join_tab->ref.key_parts;
if (ref_parts)
{