Merge lp:~linuxjedi/drizzle/trunk-bug-709493 into lp:drizzle/7.0

[Andrew Hutchings]

Backport of http://bugs.mysql.com/bug.php?id=57034

[lp:~linuxjedi/drizzle/trunk-bug-709493]

2126. By Andrew Hutchings on 2011-01-29

Doh! missed t2 for cleanup

=== modified file 'drizzled/item/cmpfunc.cc'
--- drizzled/item/cmpfunc.cc	2011-01-24 22:22:11 +0000
+++ drizzled/item/cmpfunc.cc	2011-01-29 17:06:45 +0000
@@ -5114,15 +5114,15 @@
     return 0;
   List_iterator_fast<Item_field> it(fields);
   Item *item= const_item ? const_item : it++;
+  eval_item->store_value(item);
   if ((null_value= item->null_value))
     return 0;
-  eval_item->store_value(item);
   while ((item_field= it++))
   {
     /* Skip fields of non-const tables. They haven't been read yet */
     if (item_field->field->getTable()->const_table)
     {
-      if ((null_value= item_field->null_value) || eval_item->cmp(item_field))
+      if (eval_item->cmp(item_field) || (null_value= item_field->null_value))
         return 0;
     }
   }

=== added file 'tests/suite/regression/r/709493.result'
--- tests/suite/regression/r/709493.result	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/r/709493.result	2011-01-29 17:06:45 +0000
@@ -0,0 +1,11 @@
+create table t1 (pk int primary key, col_int int, col_int_unique int unique key);
+insert into t1 values (1,NULL,2), (2,0,0);
+create table t2 (pk int primary key, col_int int, col_int_unique int unique key);
+insert into t2 values (1,0,1), (2,0,2);
+select * from t1 left join t2
+on t1.col_int_unique = t2.col_int_unique and t1.col_int = t2.col_int 
+where t1.pk=1;
+pk	col_int	col_int_unique	pk	col_int	col_int_unique
+1	NULL	2	NULL	NULL	NULL
+drop table t1;
+drop table t2;

=== added file 'tests/suite/regression/t/709493.test'
--- tests/suite/regression/t/709493.test	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/t/709493.test	2011-01-29 17:06:45 +0000
@@ -0,0 +1,11 @@
+create table t1 (pk int primary key, col_int int, col_int_unique int unique key);
+insert into t1 values (1,NULL,2), (2,0,0);
+create table t2 (pk int primary key, col_int int, col_int_unique int unique key);
+insert into t2 values (1,0,1), (2,0,2);
+
+select * from t1 left join t2
+  on t1.col_int_unique = t2.col_int_unique and t1.col_int = t2.col_int 
+  where t1.pk=1;
+
+drop table t1;
+drop table t2;