solve the lex conflict between the existing repeat() function

and repeat SP-construction

mysql-test/r/sp.result

@@ -72,10 +72,10 @@ set x = x-1;
 insert into test.t1 values ("a", x);
 end while;
 create procedure b(x int)
-sprepeat
-insert into test.t1 values ("b", x);
+repeat
+insert into test.t1 values (repeat("b",3), x);
 set x = x-1;
-until x = 0 end sprepeat;
+until x = 0 end repeat;
 create procedure c(x int)
 hmm: while x > 0 do
 insert into test.t1 values ("c", x);
@@ -187,9 +187,9 @@ delete from t1;
 call b(3);
 select * from t1;
 id	data
-b	3
-b	2
-b	1
+bbb	3
+bbb	2
+bbb	1
 delete from t1;
 call c(3);
 select * from t1;

mysql-test/t/sp.test

@@ -122,10 +122,10 @@ end while|
 
 # REPEAT
 create procedure b(x int)
-sprepeat
-  insert into test.t1 values ("b", x);
+repeat
+  insert into test.t1 values (repeat("b",3), x);
   set x = x-1;
-until x = 0 end sprepeat|
+until x = 0 end repeat|
 
 # Labelled WHILE with ITERATE (pointless really)
 create procedure c(x int)

sql/lex.h

@@ -318,7 +318,7 @@ static SYMBOL symbols[] = {
   { "REPAIR",		SYM(REPAIR),0,0},
   { "REPLACE",		SYM(REPLACE),0,0},
   { "REPLICATION",	SYM(REPLICATION),0,0},
-  { "SPREPEAT",		SYM(SPREPEAT_SYM),0,0}, /* QQ Temp. until conflict solved */
+  { "REPEAT",		SYM(REPEAT_SYM),0,0},
   { "REPEATABLE",	SYM(REPEATABLE_SYM),0,0},
   { "REQUIRE",	        SYM(REQUIRE_SYM),0,0},
   { "RESET",		SYM(RESET_SYM),0,0},
@@ -567,7 +567,6 @@ static SYMBOL sql_functions[] = {
   { "RADIANS",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_radians)},
   { "RAND",		SYM(RAND),0,0},
   { "RELEASE_LOCK",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_release_lock)},
-  { "REPEAT",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_repeat)},
   { "REVERSE",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_reverse)},
   { "ROUND",		SYM(ROUND),0,0},
   { "RPAD",		SYM(FUNC_ARG3),0,CREATE_FUNC(create_func_rpad)},

sql/sql_yacc.yy

@@ -535,8 +535,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token  ITERATE_SYM
 %token  LEAVE_SYM
 %token  LOOP_SYM
-/* QQ This is temporary, until the REPEAT conflict is solved. */
-%token  SPREPEAT_SYM
+%token  REPEAT_SYM
 %token  UNTIL_SYM
 %token  WHILE_SYM
 %token  ASENSITIVE_SYM
@@ -1284,8 +1283,8 @@ sp_unlabeled_control:
 
 	    lex->sphead->add_instr(i);
 	  }
-	| SPREPEAT_SYM sp_proc_stmts UNTIL_SYM expr END SPREPEAT_SYM
-	  { /* ^^ QQ temp. until conflict solved        ^^ */
+	| REPEAT_SYM sp_proc_stmts UNTIL_SYM expr END REPEAT_SYM
+	  {
 	    LEX *lex= Lex;
 	    uint ip= lex->sphead->instructions();
 	    sp_label_t *lab= lex->spcont->last_label();  /* Jumping back */
@@ -2517,6 +2516,8 @@ simple_expr:
 	  { $$= ((Item*(*)(Item*,Item*))($1.symbol->create_func))($3,$5);}
 	| FUNC_ARG3 '(' expr ',' expr ',' expr ')'
 	  { $$= ((Item*(*)(Item*,Item*,Item*))($1.symbol->create_func))($3,$5,$7);}
+	| REPEAT_SYM '(' expr ',' expr ')'
+	  { $$= new Item_func_repeat($3,$5); }
 	| ATAN	'(' expr ')'
 	  { $$= new Item_func_atan($3); }
 	| ATAN	'(' expr ',' expr ')'