Commit 0fa250a9 authored by unknown's avatar unknown
Browse files

A fix and a test case for Bug#21002 "Derived table not selecting from a 

"real" table fails in JOINs".

This is a regression caused by the fix for Bug 18444. 
This fix removed the assignment of empty_c_string to table->db performed 
in add_table_to_list, as neither me nor anyone else knew what it was 
there for. Now we know it and it's covered with tests: the only case 
when a table database name can be empty is when the table is a derived 
table. The fix puts the assignment back but makes it a bit more explicit.

Additionally, finally drop sp.result.orig which was checked in by mistake. 


BitKeeper/deleted/.del-sp.result.orig:
  Delete: mysql-test/r/sp.result.orig
mysql-test/r/derived.result:
  Updated result file.
mysql-test/r/sp.result:
  Test results fixed (Bug#21002)
mysql-test/t/derived.test:
  New error return for the case when MULTI-DELETE tries to delete from
  a derived table: now derived tables belong to their own db (""), and
  MUTLI-DELETE can't find the correspondent table for it in the 
  DELETE list, as it can't resolve tables in different dbs by alias
  (See Bug#21148 for details)
mysql-test/t/sp.test:
  Add a test case for Bug#21002 "Derived table not selecting from a "real"
   table fails in JOINs"
sql/sp.cc:
  Make empty_c_string globally accessible.
sql/sql_class.cc:
  Add empty_c_string definition.
sql/sql_class.h:
  Add a comment for the constructor of Table_ident which is
  used for derived tables. Make sure this constructor also initializes
  the database name, not only the table name.
sql/sql_parse.cc:
  Don't call check_db_name for empty database. 
  Currently the only case when a table database name can be empty
  is when the table is a derived table.
  Report the right error if the database name is wrong (ER_WRONG_DB_NAME,
  not ER_WRONG_TABLE_NAME).
parent c1851446

mysql-test/r/derived.result

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ select * from t1; 
N	M

3	0

delete P1.*,p2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS p2 ON P1.N = p2.N;

ERROR HY000: The target table p2 of the DELETE is not updatable

ERROR 42S02: Unknown table 'p2' in MULTI DELETE

delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;

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

drop table t1;

mysql-test/r/sp.result

+15 −0
Original line number Diff line number Diff line
@@ -5057,4 +5057,19 @@ concat('data was: /', var1, '/') 
data was: /1/

drop table t3|

drop procedure bug15217|

drop table if exists t3|

drop database if exists mysqltest1|

create table t3 (a int)|

insert into t3 (a) values (1), (2)|

create database mysqltest1|

use mysqltest1|

drop database mysqltest1|

select database()|

database()

NULL

select * from (select 1 as a) as t1 natural join (select * from test.t3) as t2|

a

1

use test|

drop table t3|

drop table t1,t2;

mysql-test/r/sp.result.orig

deleted100644 → 0
+0 −4853

File deleted.

Preview size limit exceeded, changes collapsed.

mysql-test/t/derived.test

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ UPDATE `t1` AS P1 INNER JOIN (SELECT aaaa FROM `t1` GROUP BY N HAVING Count(M) > 
delete P1.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;

select * from t1;

--replace_result P2 p2

--error 1288

--error ER_UNKNOWN_TABLE 

delete P1.*,P2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;

-- error 1054

delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;

mysql-test/t/sp.test

+25 −0
Original line number Diff line number Diff line
@@ -5962,6 +5962,31 @@ call bug15217()| 
drop table t3|

drop procedure bug15217|



#

# Bug#21002 "Derived table not selecting from a "real" table fails in JOINs"

#         

# A regression caused by the fix for Bug#18444: for derived tables we should

# set an empty string as the current database. They do not belong to any

# database and must be usable even if there is no database

# selected.

--disable_warnings

drop table if exists t3|

drop database if exists mysqltest1|

--enable_warnings

create table t3 (a int)|

insert into t3 (a) values (1), (2)|



create database mysqltest1|

use mysqltest1|

drop database mysqltest1|



# No current database

select database()|



select * from (select 1 as a) as t1 natural join (select * from test.t3) as t2|

use test|

drop table t3|



#

# BUG#NNNN: New bug synopsis

#