bk commit into 5.1 tree (msvensson:1.2426)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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:33:16+02:00, msvensson@stripped +3 -0
  Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
  into  pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197
  MERGE: 1.1810.2372.85

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

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

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

# 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/bug25197/my51-bug25197/RESYNC

--- 1.309/sql/item_strfunc.cc	2007-01-29 00:51:38 +01:00
+++ 1.310/sql/item_strfunc.cc	2007-03-28 09:33:14 +02:00
@@ -2274,8 +2274,10 @@ String *Item_func_repeat::val_str(String
   if (args[0]->null_value || args[1]->null_value)
     goto err;				// string and/or delim are null
   null_value= 0;
-  if ((count <= 0) && !args[1]->unsigned_flag)	// For nicer SQL code
+
+  if (count <= 0 && (count == 0 || !args[1]->unsigned_flag))
     return &my_empty_string;
+
   /* Assumes that the maximum length of a String is < INT_MAX32. */
   /* Bounds check on count:  If this is triggered, we will error. */
   if ((ulonglong) count > INT_MAX32)

--- 1.136/mysql-test/r/func_str.result	2007-01-24 14:54:59 +01:00
+++ 1.137/mysql-test/r/func_str.result	2007-03-28 09:33:13 +02:00
@@ -2273,4 +2273,27 @@ abcxx
 select lpad('abc', cast(5 as unsigned integer), 'x');
 lpad('abc', cast(5 as unsigned integer), 'x')
 xxabc
+DROP TABLE IF EXISTS t1;
+CREATE TABLE `t1` (
+`id` varchar(20) NOT NULL,
+`tire` tinyint(3) unsigned NOT NULL,
+PRIMARY KEY (`id`)
+);
+INSERT INTO `t1` (`id`, `tire`) VALUES ('A', 0), ('B', 1),('C', 2);
+SELECT REPEAT( '#', tire ) AS A,
+REPEAT( '#', tire % 999 ) AS B, tire FROM `t1`;
+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;
 End of 5.0 tests

--- 1.102/mysql-test/t/func_str.test	2007-01-23 10:56:45 +01:00
+++ 1.103/mysql-test/t/func_str.test	2007-03-28 09:33:14 +02:00
@@ -1115,4 +1115,30 @@ select repeat('a', cast(2 as unsigned in
 select rpad('abc', cast(5 as unsigned integer), 'x');
 select lpad('abc', cast(5 as unsigned integer), 'x');
 
+
+#
+# Bug #25197 :repeat function returns null when using table field directly as count
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE `t1` (
+  `id` varchar(20) NOT NULL,
+  `tire` tinyint(3) unsigned NOT NULL,
+  PRIMARY KEY (`id`)
+);
+
+INSERT INTO `t1` (`id`, `tire`) VALUES ('A', 0), ('B', 1),('C', 2);
+
+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;
+
 --echo End of 5.0 tests