summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-12-01 00:48:35 +0200
committermonty@mashka.mysql.fi <>2002-12-01 00:48:35 +0200
commitd02d23c4c0e5dcd3c47925ef77f5e398afe2c0c7 (patch)
treea726bf37c8fdf17db95a039fbba27a43d981696f /sql/sql_select.cc
parentbd53a30858626d6efd58f3016ed3d716fc0efd0f (diff)
downloadmariadb-git-d02d23c4c0e5dcd3c47925ef77f5e398afe2c0c7.tar.gz
Fixed some bugs from last multi-table-update push.
More tests for multi-table-update & timestamp handling
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index a97bd8bac0a..89f0ac1885a 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2744,7 +2744,7 @@ bool error_if_full_join(JOIN *join)
tab < end;
tab++)
{
- if (tab->type == JT_ALL && !tab->select->quick)
+ if (tab->type == JT_ALL && (!tab->select || !tab->select->quick))
{
my_error(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE,MYF(0));
return(1);