[Commits] Rev 2843: Post-merge fixes#2: in file:///home/psergey/dev2/maria-5.3-mwl128-dsmrr-cpk/

Sergey Petrunya psergey at askmonty.org
Mon Nov 1 23:28:52 EET 2010


At file:///home/psergey/dev2/maria-5.3-mwl128-dsmrr-cpk/

------------------------------------------------------------
revno: 2843
revision-id: psergey at askmonty.org-20101101212851-eey9fy2gxetu9jg8
parent: psergey at askmonty.org-20101101205209-olpqal025571vwn7
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: maria-5.3-mwl128-dsmrr-cpk
timestamp: Tue 2010-11-02 00:28:51 +0300
message:
  Post-merge fixes#2:
  - A certain problem with NULLs filtering was solved in two different 
    ways. Use MWL#128's approach (it's more generic) and rollback DS-MRR's.
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-11-01 17:43:02 +0000
+++ b/sql/sql_select.cc	2010-11-01 21:28:51 +0000
@@ -6723,6 +6723,7 @@
   DBUG_ENTER("make_join_select");
   if (select)
   {
+    add_not_null_conds(join);
     table_map used_tables;
     /*
       Step #1: Extract constant condition
@@ -7178,7 +7179,6 @@
       }
 
     }
-    add_not_null_conds(join);
   }
   DBUG_RETURN(0);
 }



More information about the commits mailing list