diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index e06e7ffe00c..92265c77984 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -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')
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index d42be70c057..0e4b404fe3a 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -1038,6 +1038,10 @@ 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;
 
 #
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 6b1921e5bc8..a7075a5c3a0 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2242,7 +2242,7 @@ String *Item_func_repeat::val_str(String *str)
     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. */