Fix for -fbranch-probabilites (bug 268)

Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314)
Fix for new bison 1.875
max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211)
Don't show port in SHOW PROCESSLIST for system threads
Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275)
Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
using many joined tables (Bug 212)


acinclude.m4:
  Fix for -fbranch-probabilites
configure.in:
  Fix for -fbranch-probabilites
myisam/mi_open.c:
  Give error instead of writing to stderr (Which user can't see)
mysql-test/r/join.result:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
mysql-test/r/join_outer.result:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
mysql-test/r/select.result:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
mysql-test/t/join.test:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
sql/item_strfunc.cc:
  Fix for LEFT/RIGHT/MID with multi-byte-character sets
sql/mysqld.cc:
  Fix for new bison 1.875 (Wrong error text message when one got syntax error)
sql/sql_class.cc:
  Don't show port in SHOW PROCESSLIST for system threads
sql/sql_insert.cc:
  max_insert_delayed_threads now works as documented.
  delayed_insert_timeout now works on Linux
sql/sql_parse.cc:
  Added comment
sql/sql_select.cc:
  Fix problem with ORDER BY being discarded and results returned un-sorted
sql/sql_yacc.yy:
  Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
  using many joined tables.

1 files changed, 87 insertions, 0 deletions

diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index 9f6a8762325..3211dcf76a9 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -274,3 +274,90 @@ SELECT emp.rate_code, lr.base_rate FROM t1 AS emp LEFT JOIN t2 AS lr USING (site
 rate_code	base_rate
 cust	20
 drop table t1,t2;
+create table t1 (i int);
+create table t2 (i int);
+create table t3 (i int);
+insert into t1 values(1),(2);
+insert into t2 values(2),(3);
+insert into t3 values (2),(4);
+select * from t1 natural left join t2;
+i	i
+1	NULL
+2	2
+select * from t1 left join t2 on (t1.i=t2.i);
+i	i
+1	NULL
+2	2
+select * from t1 natural left join t2 natural left join t3;
+i	i	i
+1	NULL	NULL
+2	2	2
+select * from t1 left join t2 on (t1.i=t2.i) left join t3 on (t2.i=t3.i);
+i	i	i
+1	NULL	NULL
+2	2	2
+select * from t3 natural right join t2;
+i	i
+2	2
+NULL	3
+select * from t3 right join t2 on (t3.i=t2.i);
+i	i
+2	2
+NULL	3
+select * from t3 natural right join t2 natural right join t1;
+i	i	i
+NULL	NULL	1
+2	2	2
+select * from t3 right join t2 on (t3.i=t2.i) right join t1 on (t2.i=t1.i);
+i	i	i
+NULL	NULL	1
+2	2	2
+select * from t1,t2 natural left join t3 order by t1.i,t2.i,t3.i;
+i	i	i
+1	2	2
+1	3	NULL
+2	2	2
+2	3	NULL
+select * from t1,t2 left join t3 on (t2.i=t3.i) order by t1.i,t2.i,t3.i;
+i	i	i
+1	2	2
+1	3	NULL
+2	2	2
+2	3	NULL
+select t1.i,t2.i,t3.i from t2 natural left join t3,t1 order by t1.i,t2.i,t3.i;
+i	i	i
+1	2	2
+1	3	NULL
+2	2	2
+2	3	NULL
+select t1.i,t2.i,t3.i from t2 left join t3 on (t2.i=t3.i),t1 order by t1.i,t2.i,t3.i;
+i	i	i
+1	2	2
+1	3	NULL
+2	2	2
+2	3	NULL
+select * from t1,t2 natural right join t3 order by t1.i,t2.i,t3.i;
+i	i	i
+1	NULL	4
+1	2	2
+2	NULL	4
+2	2	2
+select * from t1,t2 right join t3 on (t2.i=t3.i) order by t1.i,t2.i,t3.i;
+i	i	i
+1	NULL	4
+1	2	2
+2	NULL	4
+2	2	2
+select t1.i,t2.i,t3.i from t2 natural right join t3,t1 order by t1.i,t2.i,t3.i;
+i	i	i
+1	NULL	4
+1	2	2
+2	NULL	4
+2	2	2
+select t1.i,t2.i,t3.i from t2 right join t3 on (t2.i=t3.i),t1 order by t1.i,t2.i,t3.i;
+i	i	i
+1	NULL	4
+1	2	2
+2	NULL	4
+2	2	2
+drop table t1,t2,t3;