func_str.result:

  Correction after manual merge.

mysql-test/r/func_str.result

@@ -277,69 +277,6 @@ SELECT bugdesc, REPLACE(bugdesc, 'xxxxxxxxxxxxxxxxxxxx', 'bbbbbbbbbbbbbbbbbbbb')
 bugdesc	REPLACE(bugdesc, 'xxxxxxxxxxxxxxxxxxxx', 'bbbbbbbbbbbbbbbbbbbb')
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 drop table t1;
-CREATE TABLE t1 (id int(11) NOT NULL auto_increment, tmp text NOT NULL, KEY id (id)) TYPE=MyISAM;
-INSERT INTO t1 VALUES (1, 'a545f661efdd1fb66fdee3aab79945bf');
-SELECT 1 FROM t1 WHERE tmp=AES_DECRYPT(tmp,"password");
-1
-DROP TABLE t1;
-CREATE TABLE t1 (
-wid int(10) unsigned NOT NULL auto_increment,
-data_podp date default NULL,
-status_wnio enum('nowy','podp','real','arch') NOT NULL default 'nowy',
-PRIMARY KEY(wid)
-);
-INSERT INTO t1 VALUES (8,NULL,'real');
-INSERT INTO t1 VALUES (9,NULL,'nowy');
-SELECT elt(status_wnio,data_podp) FROM t1 GROUP BY wid;
-elt(status_wnio,data_podp)
-NULL
-NULL
-DROP TABLE t1;
-CREATE TABLE t1 (
-title text
-) TYPE=MyISAM;
-INSERT INTO t1 VALUES ('Congress reconvenes in September to debate welfare and adult education');
-INSERT INTO t1 VALUES ('House passes the CAREERS bill');
-SELECT CONCAT("</a>",RPAD("",(55 - LENGTH(title)),".")) from t1;
-CONCAT("</a>",RPAD("",(55 - LENGTH(title)),"."))
-NULL
-</a>..........................
-DROP TABLE t1;
-CREATE TABLE t1 (i int, j int);
-INSERT INTO t1 VALUES (1,1),(2,2);
-SELECT DISTINCT i, ELT(j, '345', '34') FROM t1;
-i	ELT(j, '345', '34')
-1	345
-2	34
-DROP TABLE t1;
-create table t1(a char(4));
-insert into t1 values ('one'),(NULL),('two'),('four');
-select a, quote(a), isnull(quote(a)), quote(a) is null, ifnull(quote(a), 'n') from t1;
-a	quote(a)	isnull(quote(a))	quote(a) is null	ifnull(quote(a), 'n')
-one	'one'	0	0	'one'
-NULL	NULL	0	0	NULL
-two	'two'	0	0	'two'
-four	'four'	0	0	'four'
-drop table t1;
-select trim(trailing 'foo' from 'foo');
-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;
 CREATE TABLE t1 (id int(11) NOT NULL auto_increment, tmp text NOT NULL, KEY id (id)) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1, 'a545f661efdd1fb66fdee3aab79945bf');
 SELECT 1 FROM t1 WHERE tmp=AES_DECRYPT(tmp,"password");