bk commit into 4.1 tree (Sinisa:1.2145)

[sinisa]

Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2145 04/12/25 00:07:22 Sinisa@stripped +1 -0
  additional 4.0 -> 4.1 merge !!

  mysql-test/r/func_str.result
    1.79 04/12/25 00:07:14 Sinisa@stripped +0 -1
    a little, very little mistake in the merge process

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/home/Sinisa/razno/soft/test/mysql-4.1

--- 1.78/mysql-test/r/func_str.result	Fri Dec 24 23:07:03 2004
+++ 1.79/mysql-test/r/func_str.result	Sat Dec 25 00:07:14 2004
@@ -691,7 +691,6 @@
 total	reg
 10	2004-12-10
 drop table t1;
-
 select quote(ltrim(concat('    ', 'a')));
 quote(ltrim(concat('    ', 'a')))
 'a'