bk commit into 5.0 tree (msvensson:1.2419)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-28 09:34:04+02:00, msvensson@stripped +3 -0
  Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.2392.28.2

  mysql-test/r/func_str.result@stripped, 2007-03-28 09:34:02+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.127.1.1

  mysql-test/t/func_str.test@stripped, 2007-03-28 09:34:02+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.100.1.1

  sql/item_strfunc.cc@stripped, 2007-03-28 09:34:02+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.292.4.2

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.298/sql/item_strfunc.cc	2007-03-10 17:56:09 +01:00
+++ 1.299/sql/item_strfunc.cc	2007-03-28 09:34:02 +02:00
@@ -2242,7 +2242,7 @@ String *Item_func_repeat::val_str(String
     goto err;				// string and/or delim are null
   null_value= 0;
 
-  if (count == 0 || count < 0 && !args[1]->unsigned_flag)
+  if (count <= 0 && (count == 0 || !args[1]->unsigned_flag))
     return &my_empty_string;
 
   /* Assumes that the maximum length of a String is < INT_MAX32. */

--- 1.131/mysql-test/r/func_str.result	2007-03-10 17:57:17 +01:00
+++ 1.132/mysql-test/r/func_str.result	2007-03-28 09:34:02 +02:00
@@ -1964,6 +1964,15 @@ A	B	tire
 		0
 #	#	1
 ##	##	2
+SELECT REPEAT('0', CAST(0 AS UNSIGNED));
+REPEAT('0', CAST(0 AS UNSIGNED))
+
+SELECT REPEAT('0', -2);
+REPEAT('0', -2)
+
+SELECT REPEAT('0', 2);
+REPEAT('0', 2)
+00
 DROP TABLE t1;
 SELECT UNHEX('G');
 UNHEX('G')

--- 1.103/mysql-test/t/func_str.test	2007-03-10 17:57:17 +01:00
+++ 1.104/mysql-test/t/func_str.test	2007-03-28 09:34:02 +02:00
@@ -1038,6 +1038,10 @@ INSERT INTO `t1` (`id`, `tire`) VALUES (
 SELECT REPEAT( '#', tire ) AS A,
        REPEAT( '#', tire % 999 ) AS B, tire FROM `t1`;
 
+SELECT REPEAT('0', CAST(0 AS UNSIGNED));
+SELECT REPEAT('0', -2);
+SELECT REPEAT('0', 2);
+
 DROP TABLE t1;
 
 #