Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/my/mysql-5.0


sql/sql_yacc.yy:
  Auto merged

2 files changed, 4 insertions, 4 deletions

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 7ff7779aa83..bcabf693e4c 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -851,8 +851,8 @@ repeat
 begin
 declare a char(16);
 declare b,c int;
-fetch c1 into a, b;
-fetch c2 into c;
+fetch from c1 into a, b;
+fetch next from c2 into c;
 if not done then
 if b < c then
 insert into test.t3 values (a, b);
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 654d8966255..88d1b8c0356 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -953,8 +953,8 @@ begin
     declare a char(16);
     declare b,c int;
 
-    fetch c1 into a, b;
-    fetch c2 into c;
+    fetch from c1 into a, b;
+    fetch next from c2 into c;
     if not done then
       if b < c then
         insert into test.t3 values (a, b);