summaryrefslogtreecommitdiff
path: root/mysql-test/t/innodb.test
diff options
context:
space:
mode:
authorevgen@sunlight.local <>2006-07-30 00:33:24 +0400
committerevgen@sunlight.local <>2006-07-30 00:33:24 +0400
commitef4f14953640962c405e7df7fdb803daaa878128 (patch)
tree7459ead6708231c323be75b3f99c455341370348 /mysql-test/t/innodb.test
parent8cd88a91794e37ec05509ef5ea121bcb69eef0c9 (diff)
parent3ca575dc896753f9dd52f45eaf983219d5cbd899 (diff)
downloadmariadb-git-ef4f14953640962c405e7df7fdb803daaa878128.tar.gz
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
Diffstat (limited to 'mysql-test/t/innodb.test')
-rw-r--r--mysql-test/t/innodb.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 5b1b374e487..d00c5499ef9 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -1079,7 +1079,7 @@ drop table t1,t2,t3;
#
create table t1 (id int, name char(10) not null, name2 char(10) not null) engine=innodb;
insert into t1 values(1,'first','fff'),(2,'second','sss'),(3,'third','ttt');
-select name2 from t1 union all select name from t1 union all select id from t1;
+select trim(name2) from t1 union all select trim(name) from t1 union all select trim(id) from t1;
drop table t1;
#