summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-12 13:52:32 +0200
committerunknown <monty@donna.mysql.com>2001-01-12 13:52:32 +0200
commit1a10224cacd1036f79a387698f982bfb5e36add6 (patch)
treefeed2fb14dbc49c9f89bfedaa06d5d15c58c8993 /sql/sql_select.cc
parent5060e7f3fef7658bff42f5fa955689ec58d70e15 (diff)
downloadmariadb-git-1a10224cacd1036f79a387698f982bfb5e36add6.tar.gz
Patches for NetBSD/macppc
Fixed bug in LEFT JOIN Added bdb_log_buffer_size Docs/manual.texi: Added documentation for mysqlhotcopy client/mysql.cc: Fixed core dump when column names couldn't be read configure.in: Fixed possible error mit-pthreads/Changes-mysql: Patches for NetBSD/macppc mit-pthreads/config/config.guess: Patches for NetBSD/macppc mit-pthreads/config/configure.in: Patches for NetBSD/macppc mit-pthreads/config/configure: Patches for NetBSD/macppc mysql-test/r/join_outer.result: New join test mysql-test/t/join_outer.test: New join test scripts/mysqlhotcopy.sh: Patches from ASK sql/ha_berkeley.cc: Adeed log buffer cache sql/ha_berkeley.h: Adeed log buffer cache sql/log.cc: Fixed possible overrun bug sql/mysqld.cc: Fix for Mac OS X public beta Added bdb_log_buffer_size sql/sql_select.cc: Fixed bug in LEFT JOIN tests/mail_to_db.pl: Removed unsubscribe tails tests/pmail.pl: Sort mails according to date
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8e11d60fb6e..7cbd022a7b7 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -4837,7 +4837,8 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
/*****************************************************************************
** Remove calculation with tables that aren't yet read. Remove also tests
-** against fields that are read through key.
+** against fields that are read through key where the table is not a
+** outer join table.
** We can't remove tests that are made against columns which are stored
** in sorted order.
*****************************************************************************/
@@ -4853,7 +4854,8 @@ static bool test_if_ref(Item_field *left_item,Item *right_item)
if (ref_item && ref_item->eq(right_item))
{
if (right_item->type() == Item::FIELD_ITEM)
- return field->eq_def(((Item_field *) right_item)->field);
+ return (field->eq_def(((Item_field *) right_item)->field) &&
+ !field->table->maybe_null);
if (right_item->const_item())
{
// We can remove binary fields and numerical fields except float,