diff options
| author | unknown <sergefp@mysql.com> | 2005-04-05 03:36:14 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-04-05 03:36:14 +0400 |
| commit | 903b59c74a683c8030bd511d24b23456356ea70b (patch) | |
| tree | b630b959453bd57b48c3d4f5592b73b052e46b2b /sql/sql_select.cc | |
| parent | ed1f7d375e613ee34bfc1120db1238c8fccf11ea (diff) | |
| parent | 6d2e510a30b1f3d676e93f699353b9df7a5adde3 (diff) | |
| download | mariadb-git-903b59c74a683c8030bd511d24b23456356ea70b.tar.gz | |
Merge mysql.com:/home/psergey/mysql-4.1-bug8877
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c4f6e745493..21e8316bb9e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5173,7 +5173,6 @@ static void add_not_null_conds(JOIN *join) DBUG_VOID_RETURN; null_rej->quick_fix_field(); - //psergey-todo: Flatten AND's DBUG_EXECUTE("where",print_where(null_rej, referred_tab->table->table_name);); add_cond_and_fix(&referred_tab->select_cond, null_rej); |