Commit 2b53b711 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/timka/mysql/src/5.0-virgin 

into  mysql.com:/home/timka/mysql/src/5.0-2486-merge


mysql-test/r/errors.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join_nested.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/errors.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/fulltext_order_by.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join_nested.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/sql_insert.cc:
  merge WL#2486
sql/sql_show.cc:
  merge WL#2486
parents c9415c77 7517d7e1

mysql-test/include/ps_query.inc

+6 −6
Original line number Diff line number Diff line
@@ -349,14 +349,14 @@ drop table if exists t2 ; 
--enable_warnings

create table t2 as select * from t1 ;

set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a ' ;

set @query2= 'SELECT * FROM t2 natural join t1 order by t2.a ' ;

set @query3= 'SELECT * FROM t2 join t1 using(a) order by t2.a ' ;

set @query2= 'SELECT * FROM t2 natural join t1 order by a ' ;

set @query3= 'SELECT * FROM t2 join t1 using(a) order by a ' ;

set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a ' ;

set @query5= 'SELECT * FROM t2 natural left join t1 order by t2.a ' ;

set @query6= 'SELECT * FROM t2 left join t1 using(a) order by t2.a ' ;

set @query5= 'SELECT * FROM t2 natural left join t1 order by a ' ;

set @query6= 'SELECT * FROM t2 left join t1 using(a) order by a ' ;

set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a ' ;

set @query8= 'SELECT * FROM t2 natural right join t1 order by t2.a ' ;

set @query9= 'SELECT * FROM t2 right join t1 using(a) order by t2.a ' ;

set @query8= 'SELECT * FROM t2 natural right join t1 order by a ' ;

set @query9= 'SELECT * FROM t2 right join t1 using(a) order by a ' ;

let $1= 9 ;

while ($1)

{

mysql-test/r/bdb.result

+2 −2
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ drop table t1; 
set @a:=now();

CREATE TABLE t1 (a int not null, b timestamp not null, primary key (a)) engine=bdb;

insert into t1 (a) values(1),(2),(3);

select t1.a from t1 natural join t1 as t2 where t1.b >= @a order by t1.a;

select a from t1 natural join t1 as t2 where b >= @a order by a;

a

1

2
@@ -906,7 +906,7 @@ create temporary table tmp1 
select branch_id, target_id, platform_id, product_id

from t1, t2, t3, t4 ;

create temporary table tmp2 

select tmp1.branch_id, tmp1.target_id, tmp1.platform_id, tmp1.product_id 

select branch_id, target_id, platform_id, product_id 

from tmp1 left join t8 

using (branch_id,target_id,platform_id,product_id) 

where t8.archive_id is null ;

mysql-test/r/derived.result

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ SELECT * FROM (SELECT (SELECT * FROM (SELECT 1 as a) as a )) as b; 
(SELECT * FROM (SELECT 1 as a) as a )

1

select * from (select 1 as a) b  left join (select 2 as a) c using(a);

a	a

1	NULL

a

1

SELECT * FROM (SELECT 1 UNION SELECT a) b;

ERROR 42S22: Unknown column 'a' in 'field list'

SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;

mysql-test/r/errors.result

+2 −2
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ create table t1 (a int); 
select count(test.t1.b) from t1;

ERROR 42S22: Unknown column 'test.t1.b' in 'field list'

select count(not_existing_database.t1) from t1;

ERROR 42S02: Unknown table 'not_existing_database' in field list

ERROR 42S22: Unknown column 'not_existing_database.t1' in 'field list'

select count(not_existing_database.t1.a) from t1;

ERROR 42S02: Unknown table 'not_existing_database.t1' in field list

ERROR 42S22: Unknown column 'not_existing_database.t1.a' in 'field list'

select count(not_existing_database.t1.a) from not_existing_database.t1;

Got one of the listed errors

select 1 from t1 order by 2;

mysql-test/r/fulltext.result

+8 −8
Original line number Diff line number Diff line
@@ -221,14 +221,14 @@ select t1.id FROM t2 as ttxt,t1,t1 as ticket2 
WHERE ticket2.id = ttxt.ticket AND t1.id = ticket2.ticket and

match(ttxt.inhalt) against ('foobar');

id

select t1.id FROM t2 as ttxt,t1 INNER JOIN t1 as ticket2 ON

ticket2.id = ttxt.ticket

WHERE t1.id = ticket2.ticket and match(ttxt.inhalt) against ('foobar');

select ticket2.id FROM t2 as ttxt,t2 INNER JOIN t1 as ticket2 ON

ticket2.id = t2.ticket

WHERE ticket2.id = ticket2.ticket and match(ttxt.inhalt) against ('foobar');

id

INSERT INTO t1 VALUES (3,3);

select t1.id FROM t2 as ttxt,t1

INNER JOIN t1 as ticket2 ON ticket2.id = ttxt.ticket

WHERE t1.id = ticket2.ticket and

select ticket2.id FROM t2 as ttxt,t2

INNER JOIN t1 as ticket2 ON ticket2.id = t2.ticket

WHERE ticket2.id = ticket2.ticket and

match(ttxt.inhalt) against ('foobar');

id

3
@@ -337,8 +337,8 @@ insert into t2 values (1, 1, 'xxfoo'); 
insert into t2 values (2, 1, 'xxbar');

insert into t2 values (3, 1, 'xxbuz');

select * from t1 join t2 using(`t1_id`) where match (t1.name, t2.name) against('xxfoo' in boolean mode);

t1_id	name	t2_id	t1_id	name

1	data1	1	1	xxfoo

t1_id	name	t2_id	name

1	data1	1	xxfoo

select * from t2 where match name against ('*a*b*c*d*e*f*' in boolean mode);

t2_id	t1_id	name

drop table t1,t2;