bk commit into 5.0 tree (serg:1.1797) BUG#9101

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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
  1.1797 05/03/11 21:10:41 serg@stripped +3 -0
  BUG#9101 - RELEASE/ROLLBACK TO SAVEPOINT did not forget savepoints correctly

  sql/sql_parse.cc
    1.417 05/03/11 21:10:21 serg@stripped +12 -12
    BUG#9101 - RELEASE/ROLLBACK TO SAVEPOINT did not forget savepoints correctly

  mysql-test/t/innodb.test
    1.80 05/03/11 21:10:21 serg@stripped +10 -1
    more savepoint tests

  mysql-test/r/innodb.result
    1.101 05/03/11 21:10:21 serg@stripped +7 -1
    more savepoint tests

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.416/sql/sql_parse.cc	Thu Mar 10 00:10:01 2005
+++ 1.417/sql/sql_parse.cc	Fri Mar 11 21:10:21 2005
@@ -3805,21 +3805,21 @@
     break;
   case SQLCOM_RELEASE_SAVEPOINT:
   {
-    SAVEPOINT **sv;
-    for (sv=&thd->transaction.savepoints; *sv; sv=&(*sv)->prev)
+    SAVEPOINT *sv;
+    for (sv=thd->transaction.savepoints; sv; sv=sv->prev)
     {
       if (my_strnncoll(system_charset_info,
                        (uchar *)lex->ident.str, lex->ident.length,
-                       (uchar *)(*sv)->name, (*sv)->length) == 0)
+                       (uchar *)sv->name, sv->length) == 0)
         break;
     }
-    if (*sv)
+    if (sv)
     {
-      if (ha_release_savepoint(thd, *sv))
+      if (ha_release_savepoint(thd, sv))
         res= TRUE; // cannot happen
       else
         send_ok(thd);
-      *sv=(*sv)->prev;
+      thd->transaction.savepoints=sv->prev;
     }
     else
       my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "SAVEPOINT", lex->ident.str);
@@ -3827,17 +3827,17 @@
   }
   case SQLCOM_ROLLBACK_TO_SAVEPOINT:
   {
-    SAVEPOINT **sv;
-    for (sv=&thd->transaction.savepoints; *sv; sv=&(*sv)->prev)
+    SAVEPOINT *sv;
+    for (sv=thd->transaction.savepoints; sv; sv=sv->prev)
     {
       if (my_strnncoll(system_charset_info,
                        (uchar *)lex->ident.str, lex->ident.length,
-                       (uchar *)(*sv)->name, (*sv)->length) == 0)
+                       (uchar *)sv->name, sv->length) == 0)
         break;
     }
-    if (*sv)
+    if (sv)
     {
-      if (ha_rollback_to_savepoint(thd, *sv))
+      if (ha_rollback_to_savepoint(thd, sv))
         res= TRUE; // cannot happen
       else
       {
@@ -3848,7 +3848,7 @@
                        ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));
         send_ok(thd);
       }
-      *sv=(*sv)->prev;
+      thd->transaction.savepoints=sv;
     }
     else
       my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "SAVEPOINT", lex->ident.str);

--- 1.100/mysql-test/r/innodb.result	Wed Mar  2 10:32:28 2005
+++ 1.101/mysql-test/r/innodb.result	Fri Mar 11 21:10:21 2005
@@ -262,7 +262,11 @@
 5
 6
 7
-rollback to savepoint `savept2`;
+savepoint savept3;
+rollback to savepoint savept2;
+rollback to savepoint savept3;
+ERROR 42000: SAVEPOINT savept3 does not exist
+rollback to savepoint savept2;
 release savepoint `my_savepoint`;
 select n from t1;
 n
@@ -272,6 +276,8 @@
 7
 rollback to savepoint `my_savepoint`;
 ERROR 42000: SAVEPOINT my_savepoint does not exist
+rollback to savepoint savept2;
+ERROR 42000: SAVEPOINT savept2 does not exist
 insert into t1 values (8);
 savepoint sv;
 commit;

--- 1.79/mysql-test/t/innodb.test	Wed Mar  2 10:32:28 2005
+++ 1.80/mysql-test/t/innodb.test	Fri Mar 11 21:10:21 2005
@@ -130,17 +130,26 @@
 insert into t1 values (4);
 select n from t1;
 set autocommit=0;
+#
+# savepoints
+#
 begin;
 savepoint `my_savepoint`;
 insert into t1 values (7);
 savepoint `savept2`;
 insert into t1 values (3);
 select n from t1;
-rollback to savepoint `savept2`;
+savepoint savept3;
+rollback to savepoint savept2;
+--error 1305
+rollback to savepoint savept3;
+rollback to savepoint savept2;
 release savepoint `my_savepoint`;
 select n from t1;
 -- error 1305
 rollback to savepoint `my_savepoint`;
+--error 1305
+rollback to savepoint savept2;
 insert into t1 values (8);
 savepoint sv;
 commit;