Fix for valgrind failures in get_mm_tree.

mysql-test/r/join_outer.result:
  Corrected table names
mysql-test/t/join_outer.test:
  Corrected table names
sql/item_cmpfunc.h:
  Fix for valgrind failure (unitialized read Item_func_trig_cond->const_item_cache in get_mm_tree):
   Since get_mm_tree can be called for an instance of Item_func_trig_cond, make Item_func_trig_cond::const_item() return false.
   get_mm_tree will assume Item_func_trig_cond are unknown functions and will not build range access plans for them

1 files changed, 14 insertions, 14 deletions

diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test
index ce2ce577b46..66de5e5a4c9 100644
--- a/mysql-test/t/join_outer.test
+++ b/mysql-test/t/join_outer.test
@@ -554,34 +554,34 @@ SELECT t1.flag_name,t2.flag_value
 
 DROP TABLE t1,t2;
 
-CREATE TABLE invoice (
+CREATE TABLE t1 (
   id int(11) unsigned NOT NULL auto_increment,
   text_id int(10) unsigned default NULL,
   PRIMARY KEY  (id)
 );
 
-INSERT INTO invoice VALUES("1", "0");
-INSERT INTO invoice VALUES("2", "10");
+INSERT INTO t1 VALUES("1", "0");
+INSERT INTO t1 VALUES("2", "10");
 
-CREATE TABLE text_table (
+CREATE TABLE t2 (
   text_id char(3) NOT NULL default '',
   language_id char(3) NOT NULL default '',
   text_data text,
   PRIMARY KEY  (text_id,language_id)
 );
 
-INSERT INTO text_table VALUES("0", "EN", "0-EN");
-INSERT INTO text_table VALUES("0", "SV", "0-SV");
-INSERT INTO text_table VALUES("10", "EN", "10-EN");
-INSERT INTO text_table VALUES("10", "SV", "10-SV");
+INSERT INTO t2 VALUES("0", "EN", "0-EN");
+INSERT INTO t2 VALUES("0", "SV", "0-SV");
+INSERT INTO t2 VALUES("10", "EN", "10-EN");
+INSERT INTO t2 VALUES("10", "SV", "10-SV");
 
-SELECT invoice.id, invoice.text_id, text_table.text_data
-  FROM invoice LEFT JOIN text_table
-               ON invoice.text_id = text_table.text_id
-                  AND text_table.language_id = 'SV'
-  WHERE (invoice.id LIKE '%' OR text_table.text_data LIKE '%');
+SELECT t1.id, t1.text_id, t2.text_data
+  FROM t1 LEFT JOIN t2
+               ON t1.text_id = t2.text_id
+                  AND t2.language_id = 'SV'
+  WHERE (t1.id LIKE '%' OR t2.text_data LIKE '%');
 
-DROP TABLE invoice, text_table;
+DROP TABLE t1, t2;
 
 # Test for bug #5896