Commit f335c36e authored by Sergey Petrunya's avatar Sergey Petrunya

Fix a number of trivial test failures by updating error message:

 "Unknown table tbl" is now "Unknown table database.tbl"
parent e98bb64c
...@@ -138,7 +138,7 @@ year ...@@ -138,7 +138,7 @@ year
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 CREATE TABLE t1
( (
name varchar(50) NOT NULL default '', name varchar(50) NOT NULL default '',
......
...@@ -94,7 +94,7 @@ select @ujis4 = CONVERT(@utf84 USING ujis); ...@@ -94,7 +94,7 @@ select @ujis4 = CONVERT(@utf84 USING ujis);
1 1
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
create table t1 (c1 varchar(8)) default character set 'ujis'; create table t1 (c1 varchar(8)) default character set 'ujis';
insert into t1 values (0xA4A2),(0xA2A2),(0xA4A2); insert into t1 values (0xA4A2),(0xA2A2),(0xA4A2);
select c1 as 'no index' from t1 where c1 like cast(concat(0xA4A2, '%') as char character set ujis); select c1 as 'no index' from t1 where c1 like cast(concat(0xA4A2, '%') as char character set ujis);
...@@ -168,7 +168,7 @@ a b ...@@ -168,7 +168,7 @@ a b
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1(c char(1)) character set ujis; CREATE TABLE t1(c char(1)) character set ujis;
INSERT INTO t1 VALUES(0xA2AF); INSERT INTO t1 VALUES(0xA2AF);
INSERT INTO t1 VALUES(0xA2B0); INSERT INTO t1 VALUES(0xA2B0);
......
...@@ -1160,7 +1160,7 @@ DROP TABLE t1; ...@@ -1160,7 +1160,7 @@ DROP TABLE t1;
SET NAMES utf8mb4; SET NAMES utf8mb4;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=heap DEFAULT CHARSET=utf8mb4; CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=heap DEFAULT CHARSET=utf8mb4;
INSERT INTO t1 VALUES('uuABCDEFGHIGKLMNOPRSTUVWXYZ̈bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'); INSERT INTO t1 VALUES('uuABCDEFGHIGKLMNOPRSTUVWXYZ̈bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
INSERT INTO t1 VALUES('uu'); INSERT INTO t1 VALUES('uu');
......
...@@ -1231,7 +1231,7 @@ DROP TABLE t1; ...@@ -1231,7 +1231,7 @@ DROP TABLE t1;
SET NAMES utf8mb4; SET NAMES utf8mb4;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
Warnings: Warnings:
Warning 1071 Specified key was too long; max key length is 1000 bytes Warning 1071 Specified key was too long; max key length is 1000 bytes
......
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 ( CREATE TABLE t1 (
a varchar(32) character set utf8 collate utf8_bin NOT NULL, a varchar(32) character set utf8 collate utf8_bin NOT NULL,
b varchar(32) character set utf8 collate utf8_bin NOT NULL ) b varchar(32) character set utf8 collate utf8_bin NOT NULL )
......
...@@ -128,7 +128,7 @@ End of 5.0 tests ...@@ -128,7 +128,7 @@ End of 5.0 tests
# #
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (a VARCHAR(2) CHARSET UTF8 NOT NULL); CREATE TABLE t1 (a VARCHAR(2) CHARSET UTF8 NOT NULL);
INSERT INTO t1 VALUES ('e'),('e'),('e-'); INSERT INTO t1 VALUES ('e'),('e'),('e-');
SELECT * FROM t1 PROCEDURE ANALYSE(); SELECT * FROM t1 PROCEDURE ANALYSE();
......
...@@ -273,7 +273,7 @@ t ...@@ -273,7 +273,7 @@ t
drop table t1; drop table t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 ( CREATE TABLE t1 (
c1 int, c1 int,
c2 varbinary(240), c2 varbinary(240),
......
...@@ -123,8 +123,8 @@ select query_id, count(*), sum(duration) from information_schema.profiling group ...@@ -123,8 +123,8 @@ select query_id, count(*), sum(duration) from information_schema.profiling group
select CPU_user, CPU_system, Context_voluntary, Context_involuntary, Block_ops_in, Block_ops_out, Messages_sent, Messages_received, Page_faults_major, Page_faults_minor, Swaps, Source_function, Source_file, Source_line from information_schema.profiling; select CPU_user, CPU_system, Context_voluntary, Context_involuntary, Block_ops_in, Block_ops_out, Messages_sent, Messages_received, Page_faults_major, Page_faults_minor, Swaps, Source_function, Source_file, Source_line from information_schema.profiling;
drop table if exists t1, t2, t3; drop table if exists t1, t2, t3;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
Note 1051 Unknown table 't3' Note 1051 Unknown table 'test.t3'
create table t1 (id int ); create table t1 (id int );
create table t2 (id int not null); create table t2 (id int not null);
create table t3 (id int not null primary key); create table t3 (id int not null primary key);
...@@ -309,7 +309,7 @@ select @@profiling; ...@@ -309,7 +309,7 @@ select @@profiling;
set session profiling = OFF; set session profiling = OFF;
drop table if exists profile_log; drop table if exists profile_log;
Warnings: Warnings:
Note 1051 Unknown table 'profile_log' Note 1051 Unknown table 'test.profile_log'
create table profile_log (how_many int); create table profile_log (how_many int);
drop procedure if exists p1; drop procedure if exists p1;
drop procedure if exists p2; drop procedure if exists p2;
......
...@@ -117,10 +117,10 @@ select @@global.read_only; ...@@ -117,10 +117,10 @@ select @@global.read_only;
1 1
unlock tables; unlock tables;
drop temporary table ttt; drop temporary table ttt;
ERROR 42S02: Unknown table 'ttt' ERROR 42S02: Unknown table 'test.ttt'
drop temporary table if exists ttt; drop temporary table if exists ttt;
Warnings: Warnings:
Note 1051 Unknown table 'ttt' Note 1051 Unknown table 'test.ttt'
connection default; connection default;
set global read_only=0; set global read_only=0;
drop table t1,t2; drop table t1,t2;
......
...@@ -39,7 +39,7 @@ select * from t3; ...@@ -39,7 +39,7 @@ select * from t3;
3 table 3 3 table 3
drop table if exists t1,t2,t3,t4; drop table if exists t1,t2,t3,t4;
Warnings: Warnings:
Note 1051 Unknown table 't4' Note 1051 Unknown table 'test.t4'
CREATE TABLE t1 (a int); CREATE TABLE t1 (a int);
CREATE TABLE t3 (a int); CREATE TABLE t3 (a int);
FLUSH TABLES WITH READ LOCK; FLUSH TABLES WITH READ LOCK;
......
...@@ -22,7 +22,7 @@ call sp1(); ...@@ -22,7 +22,7 @@ call sp1();
my-col my-col
1 1
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'mysqltest.t1'
select database(); select database();
database() database()
mysqltest mysqltest
...@@ -34,7 +34,7 @@ call mysqltest.sp1(); ...@@ -34,7 +34,7 @@ call mysqltest.sp1();
my-col my-col
1 1
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'mysqltest.t1'
select database(); select database();
database() database()
test test
......
...@@ -400,7 +400,7 @@ Warnings: ...@@ -400,7 +400,7 @@ Warnings:
Note 1305 PROCEDURE test.p2 does not exist Note 1305 PROCEDURE test.p2 does not exist
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1(log_msg VARCHAR(1024)); CREATE TABLE t1(log_msg VARCHAR(1024));
CREATE PROCEDURE p1(arg VARCHAR(255)) CREATE PROCEDURE p1(arg VARCHAR(255))
BEGIN BEGIN
......
...@@ -5898,7 +5898,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ; ...@@ -5898,7 +5898,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0); INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t3;
Warnings: Warnings:
Note 1051 Unknown table 't3' Note 1051 Unknown table 'test.t3'
CREATE TABLE t3 ( f3 int) ; CREATE TABLE t3 ( f3 int) ;
INSERT INTO t3 VALUES (0),(0); INSERT INTO t3 VALUES (0),(0);
SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ; SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
......
...@@ -184,7 +184,7 @@ DROP TABLE t1,t2,t3; ...@@ -184,7 +184,7 @@ DROP TABLE t1,t2,t3;
# #
DROP TABLE IF EXISTS `t1`; DROP TABLE IF EXISTS `t1`;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE `t1` ( CREATE TABLE `t1` (
`node_uid` bigint(20) unsigned DEFAULT NULL, `node_uid` bigint(20) unsigned DEFAULT NULL,
`date` datetime DEFAULT NULL, `date` datetime DEFAULT NULL,
......
...@@ -437,8 +437,8 @@ drop table t1; ...@@ -437,8 +437,8 @@ drop table t1;
# #
drop table if exists `t1`,`t2`; drop table if exists `t1`,`t2`;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
create table `t1`(`a` char(1) character set utf8)engine=innodb; create table `t1`(`a` char(1) character set utf8)engine=innodb;
create table `t2`(`b` char(1) character set utf8)engine=memory; create table `t2`(`b` char(1) character set utf8)engine=memory;
select distinct (select 1 from `t2` where `a`) `d2` from `t1`; select distinct (select 1 from `t2` where `a`) `d2` from `t1`;
......
...@@ -5899,7 +5899,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ; ...@@ -5899,7 +5899,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0); INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t3;
Warnings: Warnings:
Note 1051 Unknown table 't3' Note 1051 Unknown table 'test.t3'
CREATE TABLE t3 ( f3 int) ; CREATE TABLE t3 ( f3 int) ;
INSERT INTO t3 VALUES (0),(0); INSERT INTO t3 VALUES (0),(0);
SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ; SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
......
...@@ -5895,7 +5895,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ; ...@@ -5895,7 +5895,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0); INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t3;
Warnings: Warnings:
Note 1051 Unknown table 't3' Note 1051 Unknown table 'test.t3'
CREATE TABLE t3 ( f3 int) ; CREATE TABLE t3 ( f3 int) ;
INSERT INTO t3 VALUES (0),(0); INSERT INTO t3 VALUES (0),(0);
SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ; SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
......
...@@ -5904,7 +5904,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ; ...@@ -5904,7 +5904,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0); INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t3;
Warnings: Warnings:
Note 1051 Unknown table 't3' Note 1051 Unknown table 'test.t3'
CREATE TABLE t3 ( f3 int) ; CREATE TABLE t3 ( f3 int) ;
INSERT INTO t3 VALUES (0),(0); INSERT INTO t3 VALUES (0),(0);
SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ; SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
......
...@@ -5895,7 +5895,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ; ...@@ -5895,7 +5895,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0); INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t3;
Warnings: Warnings:
Note 1051 Unknown table 't3' Note 1051 Unknown table 'test.t3'
CREATE TABLE t3 ( f3 int) ; CREATE TABLE t3 ( f3 int) ;
INSERT INTO t3 VALUES (0),(0); INSERT INTO t3 VALUES (0),(0);
SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ; SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
......
...@@ -680,7 +680,7 @@ select 0.8 = 0.7 + 0.1; ...@@ -680,7 +680,7 @@ select 0.8 = 0.7 + 0.1;
1 1
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
create table t1 (col1 decimal(38)); create table t1 (col1 decimal(38));
insert into t1 values (12345678901234567890123456789012345678); insert into t1 values (12345678901234567890123456789012345678);
select * from t1; select * from t1;
......
...@@ -48,13 +48,13 @@ drop table t1; ...@@ -48,13 +48,13 @@ drop table t1;
set SQL_WARNINGS=0; set SQL_WARNINGS=0;
drop temporary table if exists not_exists; drop temporary table if exists not_exists;
Warnings: Warnings:
Note 1051 Unknown table 'not_exists' Note 1051 Unknown table 'test.not_exists'
drop table if exists not_exists_table; drop table if exists not_exists_table;
Warnings: Warnings:
Note 1051 Unknown table 'not_exists_table' Note 1051 Unknown table 'test.not_exists_table'
show warnings limit 1; show warnings limit 1;
Level Code Message Level Code Message
Note 1051 Unknown table 'not_exists_table' Note 1051 Unknown table 'test.not_exists_table'
drop database if exists not_exists_db; drop database if exists not_exists_db;
Warnings: Warnings:
Note 1008 Can't drop database 'not_exists_db'; database doesn't exist Note 1008 Can't drop database 'not_exists_db'; database doesn't exist
...@@ -311,10 +311,10 @@ insert into t2 values(@q); ...@@ -311,10 +311,10 @@ insert into t2 values(@q);
ERROR 22001: Data too long for column 'c_tinyblob' at row 1 ERROR 22001: Data too long for column 'c_tinyblob' at row 1
drop table t1, t2; drop table t1, t2;
DROP TABLE t1; DROP TABLE t1;
ERROR 42S02: Unknown table 't1' ERROR 42S02: Unknown table 'test.t1'
SHOW ERRORS; SHOW ERRORS;
Level Code Message Level Code Message
Error 1051 Unknown table 't1' Error 1051 Unknown table 'test.t1'
End of 5.0 tests End of 5.0 tests
set sql_mode = default; set sql_mode = default;
select CAST(a AS DECIMAL(13,5)) FROM (SELECT '' as a) t; select CAST(a AS DECIMAL(13,5)) FROM (SELECT '' as a) t;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment