mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

pure coverage test updates

Browse source
This commit is contained in:
unknown 2002-12-30 15:10:10 -08:00
parent 4e56ad9204
commit cbe18bae8b
3 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mysql-test/r/create.result
View file

@ -198,9 +198,9 @@ t3 CREATE TABLE `t3` (
) TYPE=MyISAM CHARSET=latin1 ) TYPE=MyISAM CHARSET=latin1
select * from t3; select * from t3;
id name id name
drop table t3; drop table t2, t3;
drop database if exists test_$1;
create database test_$1; create database test_$1;
drop table if exists test_$1.t3;
create table test_$1.t3 like t1; create table test_$1.t3 like t1;
create temporary table t3 like test_$1.t3; create temporary table t3 like test_$1.t3;
show create table t3; show create table t3;
@ -209,6 +209,15 @@ t3 CREATE TEMPORARY TABLE `t3` (
`id` int(11) NOT NULL default '0', `id` int(11) NOT NULL default '0',
`name` char(20) character set latin1 default NULL `name` char(20) character set latin1 default NULL
) TYPE=MyISAM CHARSET=latin1 ) TYPE=MyISAM CHARSET=latin1
create table t2 like t3;
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
`id` int(11) NOT NULL default '0',
`name` char(20) character set latin1 default NULL
) TYPE=MyISAM CHARSET=latin1
select * from t2;
id name
create table t3 like t1; create table t3 like t1;
create table t3 like test_$1.t3; create table t3 like test_$1.t3;
Table 't3' already exists Table 't3' already exists
@ -218,6 +227,8 @@ create table t3 like non_existing_table;
Unknown table 'non_existing_table' Unknown table 'non_existing_table'
create temporary table t3 like t1; create temporary table t3 like t1;
Table 't3' already exists Table 't3' already exists
create table t3 like `a/a`;
Incorrect table name 'a/a'
drop table t1, t2, t3; drop table t1, t2, t3;
drop table t3; drop table t3;
drop database test_$1; drop database test_$1;

8
mysql-test/t/create.test
View file

@ -134,18 +134,22 @@ select * from t3;
drop table t3; drop table t3;
show create table t3; show create table t3;
select * from t3; select * from t3;
drop table t3; drop table t2, t3;
drop database if exists test_$1;
create database test_$1; create database test_$1;
drop table if exists test_$1.t3;
create table test_$1.t3 like t1; create table test_$1.t3 like t1;
create temporary table t3 like test_$1.t3; create temporary table t3 like test_$1.t3;
show create table t3; show create table t3;
create table t2 like t3;
show create table t2;
select * from t2;
create table t3 like t1; create table t3 like t1;
!$1050 create table t3 like test_$1.t3; !$1050 create table t3 like test_$1.t3;
--error 1044,1 --error 1044,1
create table non_existing_database.t1 like t1; create table non_existing_database.t1 like t1;
!$1051 create table t3 like non_existing_table; !$1051 create table t3 like non_existing_table;
!$1050 create temporary table t3 like t1; !$1050 create temporary table t3 like t1;
!$1103 create table t3 like `a/a`;
drop table t1, t2, t3; drop table t1, t2, t3;
drop table t3; drop table t3;
drop database test_$1; drop database test_$1;

14
sql/sql_table.cc
View file

@ -1413,8 +1413,8 @@ int mysql_create_like_table(THD* thd, TABLE_LIST* table,
check_table_name(src_table,table_ident->table.length)) || check_table_name(src_table,table_ident->table.length)) ||
table_ident->db.str && check_db_name((src_db= table_ident->db.str))) table_ident->db.str && check_db_name((src_db= table_ident->db.str)))
{ {
net_printf(thd,ER_WRONG_TABLE_NAME,src_table); my_error(ER_WRONG_TABLE_NAME, MYF(0), src_table);
DBUG_RETURN(0); DBUG_RETURN(-1);
} }
if ((tmp_table= find_temporary_table(thd, src_db, src_table))) if ((tmp_table= find_temporary_table(thd, src_db, src_table)))
@ -1470,14 +1470,16 @@ int mysql_create_like_table(THD* thd, TABLE_LIST* table,
{ {
if (err || !open_temporary_table(thd, dst_path, db, table_name, 1)) if (err || !open_temporary_table(thd, dst_path, db, table_name, 1))
{ {
(void) rm_temporary_table(create_info->db_type, dst_path); (void) rm_temporary_table(create_info->db_type,
DBUG_RETURN(-1); dst_path); /* purecov: inspected */
DBUG_RETURN(-1); /* purecov: inspected */
} }
} }
else if (err) else if (err)
{ {
(void) quick_rm_table(create_info->db_type, db, table_name); (void) quick_rm_table(create_info->db_type, db,
DBUG_RETURN(-1); table_name); /* purecov: inspected */
DBUG_RETURN(-1); /* purecov: inspected */
} }
DBUG_RETURN(0); DBUG_RETURN(0);