Commit 8ecae2e6 authored by unknown's avatar unknown
Browse files

Fix merge of func_str tests (accidently duplicated a test). 


mysql-test/t/func_str.test:
  Remove duplicated test that crept in during merge
mysql-test/r/func_str.result:
  Update results
parent 33e74b14

mysql-test/r/func_str.result

+13 −13
Original line number Diff line number Diff line
@@ -325,6 +325,19 @@ trim(trailing 'foo' from 'foo') 
select trim(leading 'foo' from 'foo');

trim(leading 'foo' from 'foo')



select quote(ltrim(concat('    ', 'a')));

quote(ltrim(concat('    ', 'a')))

'a'

select quote(trim(concat('    ', 'a')));

quote(trim(concat('    ', 'a')))

'a'

CREATE TABLE t1 SELECT 1 UNION SELECT 2 UNION SELECT 3;

SELECT QUOTE('A') FROM t1;

QUOTE('A')

'A'

'A'

'A'

DROP TABLE t1;

select 1=_latin1'1';

1=_latin1'1'

1
@@ -691,19 +704,6 @@ select count(*) as total, left(c,10) as reg from t1 group by reg order by reg de 
total	reg

10	2004-12-10

drop table t1;

select quote(ltrim(concat('    ', 'a')));

quote(ltrim(concat('    ', 'a')))

'a'

select quote(trim(concat('    ', 'a')));

quote(trim(concat('    ', 'a')))

'a'

CREATE TABLE t1 SELECT 1 UNION SELECT 2 UNION SELECT 3;

SELECT QUOTE('A') FROM t1;

QUOTE('A')

'A'

'A'

'A'

DROP TABLE t1;

select trim(null from 'kate') as "must_be_null";

must_be_null

NULL

mysql-test/t/func_str.test

+1 −6
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ select quote(trim(concat(' ', 'a'))); 
CREATE TABLE t1 SELECT 1 UNION SELECT 2 UNION SELECT 3;

SELECT QUOTE('A') FROM t1;

DROP TABLE t1;



# Test collation and coercibility

#
@@ -440,12 +441,6 @@ create table t1 (a int not null primary key, b varchar(40), c datetime); 
insert into t1 (a,b,c) values (1,'Tom','2004-12-10 12:13:14'),(2,'ball games','2004-12-10 12:13:14'), (3,'Basil','2004-12-10 12:13:14'), (4,'Dean','2004-12-10 12:13:14'),(5,'Ellis','2004-12-10 12:13:14'), (6,'Serg','2004-12-10 12:13:14'), (7,'Sergei','2004-12-10 12:13:14'),(8,'Georg','2004-12-10 12:13:14'),(9,'Salle','2004-12-10 12:13:14'),(10,'Sinisa','2004-12-10 12:13:14'); 

select count(*) as total, left(c,10) as reg from t1 group by reg order by reg desc limit 0,12;

drop table t1;

# crashing bug with QUOTE() and LTRIM() or TRIM() fixed

# Bug #7495

#



select quote(ltrim(concat('    ', 'a')));

select quote(trim(concat('    ', 'a')));



#

# Bug#7455 unexpected result: TRIM(<NULL> FROM <whatever>) gives NOT NULL