mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
a1c6a39a13
------------------------------------------------------------ revno: 3672 committer: lars-erik.bjork@sun.com branch nick: 48067-mysql-6.0-codebase-bugfixing timestamp: Mon 2009-10-26 13:51:43 +0100 message: This is a patch for bug#48067 "A temp table with the same name as an existing table, makes drop database fail" When dropping the database, mysql_rm_known_files() reads the contents of the database directory, and creates a TABLE_LIST object, for each .frm file encountered. Temporary tables, however, are not associated with any .frm file. The list of tables to drop are passed to mysql_rm_table_part2(). This method prefers temporary tables over regular tables, so if there is a temporary table with the same name as a regular, the temporary is removed, leaving the regular table intact. Regular tables are only deleted if there are no temporary tables with the same name. This fix ensures, that for all TABLE_LIST objects that are created by mysql_rm_known_files(), 'open_type' is set to 'OT_BASE_ONLY', to indicate that this is a regular table. In all cases in mysql_rm_table_part2() where we prefer a temporary table to a non-temporary table, we chek if 'open_type' equals 'OT_BASE_ONLY'. mysql-test/r/temp_table.result: The expected result of the test. mysql-test/t/temp_table.test: Test based on the bug report. sql/sql_db.cc: For all TABLE_LIST objects that are created by mysql_rm_known_files(), 'open_type' is set to 'OT_BASE_ONLY', to indicate that these are regular tables. sql/sql_table.cc: Check if 'open_type' is set to 'OT_BASE_ONLY, every place a temporary table is preferred to a non-temporary table.
225 lines
6 KiB
Text
225 lines
6 KiB
Text
drop table if exists t1,t2;
|
|
drop view if exists v1;
|
|
CREATE TABLE t1 (c int not null, d char (10) not null);
|
|
insert into t1 values(1,""),(2,"a"),(3,"b");
|
|
CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null);
|
|
insert into t1 values(4,"e"),(5,"f"),(6,"g");
|
|
alter table t1 rename t2;
|
|
select * from t1;
|
|
c d
|
|
1
|
|
2 a
|
|
3 b
|
|
select * from t2;
|
|
a b
|
|
4 e
|
|
5 f
|
|
6 g
|
|
CREATE TABLE t2 (x int not null, y int not null);
|
|
alter table t2 rename t1;
|
|
select * from t1;
|
|
a b
|
|
4 e
|
|
5 f
|
|
6 g
|
|
create TEMPORARY TABLE t2 engine=heap select * from t1;
|
|
create TEMPORARY TABLE IF NOT EXISTS t2 (a int) engine=heap;
|
|
Warnings:
|
|
Note 1050 Table 't2' already exists
|
|
CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null);
|
|
ERROR 42S01: Table 't1' already exists
|
|
ALTER TABLE t1 RENAME t2;
|
|
ERROR 42S01: Table 't2' already exists
|
|
select * from t2;
|
|
a b
|
|
4 e
|
|
5 f
|
|
6 g
|
|
alter table t2 add primary key (a,b);
|
|
drop table t1,t2;
|
|
select * from t1;
|
|
c d
|
|
1
|
|
2 a
|
|
3 b
|
|
drop table t2;
|
|
create temporary table t1 select *,2 as "e" from t1;
|
|
select * from t1;
|
|
c d e
|
|
1 2
|
|
2 a 2
|
|
3 b 2
|
|
drop table t1;
|
|
drop table t1;
|
|
CREATE TABLE t1 (pkCrash INTEGER PRIMARY KEY,strCrash VARCHAR(255));
|
|
INSERT INTO t1 ( pkCrash, strCrash ) VALUES ( 1, '1');
|
|
SELECT CONCAT_WS(pkCrash, strCrash) FROM t1;
|
|
CONCAT_WS(pkCrash, strCrash)
|
|
1
|
|
drop table t1;
|
|
create temporary table t1 select 1 as 'x';
|
|
drop table t1;
|
|
CREATE TABLE t1 (x INT);
|
|
INSERT INTO t1 VALUES (1), (2), (3);
|
|
CREATE TEMPORARY TABLE tmp SELECT *, NULL FROM t1;
|
|
drop table t1;
|
|
create temporary table t1 (id int(10) not null unique);
|
|
create temporary table t2 (id int(10) not null primary key,
|
|
val int(10) not null);
|
|
insert into t1 values (1),(2),(4);
|
|
insert into t2 values (1,1),(2,1),(3,1),(4,2);
|
|
select one.id, two.val, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id order by one.id;
|
|
id val elt(two.val,'one','two')
|
|
1 1 one
|
|
2 1 one
|
|
4 2 two
|
|
drop table t1,t2;
|
|
create temporary table t1 (a int not null);
|
|
insert into t1 values (1),(1);
|
|
alter table t1 add primary key (a);
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
drop table t1;
|
|
CREATE TABLE t1 (
|
|
d datetime default NULL
|
|
) ENGINE=MyISAM;
|
|
INSERT INTO t1 VALUES ('2002-10-24 14:50:32'),('2002-10-24 14:50:33'),('2002-10-24 14:50:34'),('2002-10-24 14:50:34'),('2002-10-24 14:50:34'),('2002-10-24 14:50:35'),('2002-10-24 14:50:35'),('2002-10-24 14:50:35'),('2002-10-24 14:50:35'),('2002-10-24 14:50:36'),('2002-10-24 14:50:36'),('2002-10-24 14:50:36'),('2002-10-24 14:50:36'),('2002-10-24 14:50:37'),('2002-10-24 14:50:37'),('2002-10-24 14:50:37'),('2002-10-24 14:50:37'),('2002-10-24 14:50:38'),('2002-10-24 14:50:38'),('2002-10-24 14:50:38'),('2002-10-24 14:50:39'),('2002-10-24 14:50:39'),('2002-10-24 14:50:39'),('2002-10-24 14:50:39'),('2002-10-24 14:50:40'),('2002-10-24 14:50:40'),('2002-10-24 14:50:40');
|
|
flush status;
|
|
select * from t1 group by d;
|
|
d
|
|
2002-10-24 14:50:32
|
|
2002-10-24 14:50:33
|
|
2002-10-24 14:50:34
|
|
2002-10-24 14:50:35
|
|
2002-10-24 14:50:36
|
|
2002-10-24 14:50:37
|
|
2002-10-24 14:50:38
|
|
2002-10-24 14:50:39
|
|
2002-10-24 14:50:40
|
|
show status like "created_tmp%tables";
|
|
Variable_name Value
|
|
Created_tmp_disk_tables 0
|
|
Created_tmp_tables 1
|
|
drop table t1;
|
|
create temporary table v1 as select 'This is temp. table' A;
|
|
create view v1 as select 'This is view' A;
|
|
select * from v1;
|
|
A
|
|
This is temp. table
|
|
show create table v1;
|
|
Table Create Table
|
|
v1 CREATE TEMPORARY TABLE `v1` (
|
|
`A` varchar(19) NOT NULL DEFAULT ''
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
show create view v1;
|
|
View Create View character_set_client collation_connection
|
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 'This is view' AS `A` latin1 latin1_swedish_ci
|
|
drop view v1;
|
|
select * from v1;
|
|
A
|
|
This is temp. table
|
|
create view v1 as select 'This is view again' A;
|
|
select * from v1;
|
|
A
|
|
This is temp. table
|
|
drop table v1;
|
|
select * from v1;
|
|
A
|
|
This is view again
|
|
drop view v1;
|
|
create table t1 (a int, b int, index(a), index(b));
|
|
create table t2 (c int auto_increment, d varchar(255), primary key (c));
|
|
insert into t1 values (3,1),(3,2);
|
|
insert into t2 values (NULL, 'foo'), (NULL, 'bar');
|
|
select d, c from t1 left join t2 on b = c where a = 3 order by d;
|
|
d c
|
|
bar 2
|
|
foo 1
|
|
drop table t1, t2;
|
|
DROP TABLE IF EXISTS t1;
|
|
CREATE TABLE t1 (i INT);
|
|
LOCK TABLE t1 WRITE;
|
|
CREATE TEMPORARY TABLE t1 (i INT);
|
|
The following command should not block
|
|
DROP TEMPORARY TABLE t1;
|
|
DROP TABLE t1;
|
|
CREATE TABLE t1 (i INT);
|
|
CREATE TEMPORARY TABLE t2 (i INT);
|
|
DROP TEMPORARY TABLE t2, t1;
|
|
ERROR 42S02: Unknown table 't1'
|
|
SELECT * FROM t2;
|
|
ERROR 42S02: Table 'test.t2' doesn't exist
|
|
SELECT * FROM t1;
|
|
i
|
|
DROP TABLE t1;
|
|
End of 4.1 tests.
|
|
CREATE TABLE t1 ( c FLOAT( 20, 14 ) );
|
|
INSERT INTO t1 VALUES( 12139 );
|
|
CREATE TABLE t2 ( c FLOAT(30,18) );
|
|
INSERT INTO t2 VALUES( 123456 );
|
|
SELECT AVG( c ) FROM t1 UNION SELECT 1;
|
|
AVG( c )
|
|
12139
|
|
1
|
|
SELECT 1 UNION SELECT AVG( c ) FROM t1;
|
|
1
|
|
1
|
|
12139
|
|
SELECT 1 UNION SELECT * FROM t2 UNION SELECT 1;
|
|
1
|
|
1
|
|
123456
|
|
SELECT c/1 FROM t1 UNION SELECT 1;
|
|
c/1
|
|
12139
|
|
1
|
|
DROP TABLE t1, t2;
|
|
create temporary table t1 (a int);
|
|
insert into t1 values (4711);
|
|
select * from t1;
|
|
a
|
|
4711
|
|
truncate t1;
|
|
insert into t1 values (42);
|
|
select * from t1;
|
|
a
|
|
42
|
|
drop table t1;
|
|
CREATE TEMPORARY TABLE t1(a INT, b VARCHAR(20));
|
|
INSERT INTO t1 VALUES(1, 'val1'), (2, 'val2'), (3, 'val3');
|
|
DELETE FROM t1 WHERE a=1;
|
|
SELECT count(*) FROM t1;
|
|
count(*)
|
|
2
|
|
DELETE FROM t1;
|
|
SELECT * FROM t1;
|
|
a b
|
|
DROP TABLE t1;
|
|
DROP TABLE IF EXISTS t1,t2;
|
|
DROP FUNCTION IF EXISTS f1;
|
|
CREATE TEMPORARY TABLE t1 (a INT);
|
|
CREATE TEMPORARY TABLE t2 LIKE t1;
|
|
CREATE FUNCTION f1() RETURNS INT
|
|
BEGIN
|
|
return 1;
|
|
END|
|
|
INSERT INTO t2 SELECT * FROM t1;
|
|
INSERT INTO t1 SELECT f1();
|
|
CREATE TABLE t3 SELECT * FROM t1;
|
|
INSERT INTO t1 SELECT f1();
|
|
UPDATE t1,t2 SET t1.a = t2.a;
|
|
INSERT INTO t2 SELECT f1();
|
|
DROP TABLE t1,t2,t3;
|
|
DROP FUNCTION f1;
|
|
#
|
|
# Bug #48067: A temp table with the same name as an existing table,
|
|
# makes drop database fail.
|
|
#
|
|
DROP TEMPORARY TABLE IF EXISTS bug48067.t1;
|
|
DROP DATABASE IF EXISTS bug48067;
|
|
CREATE DATABASE bug48067;
|
|
CREATE TABLE bug48067.t1 (c1 int);
|
|
INSERT INTO bug48067.t1 values (1);
|
|
CREATE TEMPORARY TABLE bug48067.t1 (c1 int);
|
|
DROP DATABASE bug48067;
|
|
DROP TEMPORARY table bug48067.t1;
|
|
End of 5.1 tests
|