Commit b1cecee0 authored by unknown's avatar unknown
Browse files

Language/consistency edits to error messages 

and affected test results.
parent a35bd157

mysql-test/r/bdb-deadlock.result

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ set autocommit=0; 
update t2 set x = 1 where id = 0;

select x from t1 where id = 0;

select x from t2 where id = 0;

ERROR 40001: Deadlock found when trying to get lock; Try restarting transaction

ERROR 40001: Deadlock found when trying to get lock; try restarting transaction

commit;

x

1

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ drop table if exists t1; 
Warnings:

Note	1051	Unknown table 't1'

create table t1 (ordid int(8) not null auto_increment, ord  varchar(50) not null, primary key (ord,ordid)) engine=heap;

ERROR 42000: Incorrect table definition; There can only be one auto column and it must be defined as a key

ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key

create table not_existing_database.test (a int);

Got one of the listed errors

create table `a/a` (a int);

mysql-test/r/date_formats.result

+8 −8
Original line number Diff line number Diff line
@@ -303,14 +303,14 @@ date format str_to_date 
2003-01-02 10:11:12	%Y-%m-%d %h:%i:%S	2003-01-02 10:11:12

03-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	0003-01-02 22:11:12

Warnings:

Note	1292	Truncated wrong string value: '10:20:10AM'

Note	1292	Truncated incorrect string value: '10:20:10AM'

select date,format,concat(str_to_date(date, format),'') as con from t1;

date	format	con

10:20:10AM	%h:%i:%s	0000-00-00 10:20:10

2003-01-02 10:11:12	%Y-%m-%d %h:%i:%S	2003-01-02 10:11:12

03-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	0003-01-02 22:11:12

Warnings:

Note	1292	Truncated wrong string value: '10:20:10AM'

Note	1292	Truncated incorrect string value: '10:20:10AM'

drop table t1;

select get_format(DATE, 'USA') as a;

a
@@ -374,7 +374,7 @@ str_to_date("02 10", "%d %f") as f6; 
f1	f2	f3	f4	f5	f6

2003-01-02 10:11:12.001200	2003-01-02 10:11:12	2003-01-02	58:11:12	58:11:12	48:00:00.100000

Warnings:

Note	1292	Truncated wrong datetime value: '2003-01-02 10:11:12.0012'

Note	1292	Truncated incorrect datetime value: '2003-01-02 10:11:12.0012'

drop table t1, t2;

select str_to_date("2003-01-02 10:11:12.0012ABCD", "%Y-%m-%d %H:%i:%S.%f") as f1,

addtime("-01:01:01.01 GGG", "-23:59:59.1") as f2,
@@ -382,13 +382,13 @@ microsecond("1997-12-31 23:59:59.01XXXX") as f3; 
f1	f2	f3

2003-01-02 10:11:12.001200	-25:01:00.110000	10000

Warnings:

Note	1292	Truncated wrong datetime value: '2003-01-02 10:11:12.0012ABCD'

Note	1292	Truncated wrong time value: '-01:01:01.01 GG'

Note	1292	Truncated wrong datetime value: '1997-12-31 23:59:59.01XXXX'

Note	1292	Truncated incorrect datetime value: '2003-01-02 10:11:12.0012ABCD'

Note	1292	Truncated incorrect time value: '-01:01:01.01 GG'

Note	1292	Truncated incorrect datetime value: '1997-12-31 23:59:59.01XXXX'

select str_to_date("2003-04-05  g", "%Y-%m-%d") as f1,

str_to_date("2003-04-05 10:11:12.101010234567", "%Y-%m-%d %H:%i:%S.%f") as f2;

f1	f2

2003-04-05	2003-04-05 10:11:12.101010

Warnings:

Note	1292	Truncated wrong date value: '2003-04-05  g'

Note	1292	Truncated wrong datetime value: '2003-04-05 10:11:12.101010234567'
 
Note	1292	Truncated incorrect date value: '2003-04-05  g'

Note	1292	Truncated incorrect datetime value: '2003-04-05 10:11:12.101010234567'

mysql-test/r/derived.result

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ a y 
SELECT a FROM (SELECT 1 FROM (SELECT 1) a HAVING a=1) b;

ERROR 42S22: Unknown column 'a' in 'having clause'

SELECT a,b as a FROM (SELECT '1' as a,'2' as b) b  HAVING a=1;

ERROR 23000: Column: 'a' in having clause is ambiguous

ERROR 23000: Column 'a' in having clause is ambiguous

SELECT a,2 as a FROM (SELECT '1' as a) b HAVING a=2;

a	a

1	2
@@ -204,7 +204,7 @@ x 
1

create table t1 select 1 as a;

select 2 as a from (select * from t1) b;

ERROR 3D000: No Database Selected

ERROR 3D000: No database selected

use test;

select 2 as a from (select * from t1) b;

a

mysql-test/r/fulltext.result

+2 −2
Original line number Diff line number Diff line
@@ -253,11 +253,11 @@ KEY tig (ticket), 
fulltext index tix (inhalt)

);

select * from t2 where MATCH inhalt AGAINST (t2.inhalt);

ERROR HY000: Wrong arguments to AGAINST

ERROR HY000: Incorrect arguments to AGAINST

select * from t2 where MATCH ticket AGAINST ('foobar');

ERROR HY000: Can't find FULLTEXT index matching the column list

select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');

ERROR HY000: Wrong arguments to MATCH

ERROR HY000: Incorrect arguments to MATCH

drop table t1,t2,t3;

CREATE TABLE t1 (

id int(11)  auto_increment,