diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-14 17:49:01 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-14 17:49:01 +0200 |
| commit | 5a9437ac05635aae57fabbfb54d655b92942486a (patch) | |
| tree | 83ced56eeeb8e8fc8c70477eb454d5e43fb8cb56 /mysql-test/t/func_str.test | |
| parent | c9fd2749f7628969ec0a83e86add7b6b2420fd89 (diff) | |
| parent | f935c6a2861414dac42b77c80010881ca674b1f0 (diff) | |
| download | mariadb-git-5a9437ac05635aae57fabbfb54d655b92942486a.tar.gz | |
merge
mysql-test/r/derived.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/func_str.test')
| -rw-r--r-- | mysql-test/t/func_str.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index bd92182b101..d355cc95317 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -115,9 +115,9 @@ CREATE TABLE t1 ( ) TYPE=MyISAM; INSERT INTO t1 VALUES (1,'Link',1,1,1,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa','2001-02-28 08:40:16',20010228084016,0,4); -SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified,bugstatus,submitter), '"') FROM t1; +SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter), '"') FROM t1; SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugstatus,submitter), '"') FROM t1; -SELECT CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified,bugstatus,submitter) FROM t1; +SELECT CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter) FROM t1; drop table t1; # |