bzr push into mysql-5.0-bugteam branch (ramil:2715 to 2716) Bug#26288

[Ramil Kalimullin]

 2716 Ramil Kalimullin	2009-03-27
      Fix for bug #26288: savepoint not deleted, comit on empty transaction
      
      Problem: commit doesn't delete savepoints if there are no changes 
      in the transaction.
      
      Fix: delete them in such cases.
     @ mysql-test/r/innodb_mysql.result
        Fix for bug #26288: savepoint not deleted, comit on empty transaction
          - test result.
     @ mysql-test/t/innodb_mysql.test
        Fix for bug #26288: savepoint not deleted, comit on empty transaction
          - test case.
     @ sql/handler.cc
        Fix for bug #26288: savepoint not deleted, comit on empty transaction
          - call transaction.cleanup() even if nht is 0 to delete 
        possible savepoints.

    modified:
      mysql-test/r/innodb_mysql.result
      mysql-test/t/innodb_mysql.test
      sql/handler.cc
 2715 Leonard Zhou	2009-03-27 [merge]
      Merge

    removed:
      sql-bench/TODO
    added:
      mysql-test/include/wait_until_disconnected.inc
      mysql-test/r/lock_multi_bug38499.result
      mysql-test/r/lock_multi_bug38691.result
      mysql-test/r/mysql-bug41486.result
      mysql-test/t/lock_multi_bug38499.test
      mysql-test/t/lock_multi_bug38691.test
      mysql-test/t/mysql-bug41486.test
    modified:
      client/my_readline.h
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlmanager-pwgen.c
      client/mysqltest.c
      client/readline.cc
      client/sql_string.cc
      config/ac-macros/misc.m4
      configure.in
      extra/comp_err.c
      extra/yassl/src/buffer.cpp
      extra/yassl/src/cert_wrapper.cpp
      extra/yassl/src/ssl.cpp
      extra/yassl/src/yassl_imp.cpp
      extra/yassl/src/yassl_int.cpp
      extra/yassl/taocrypt/include/block.hpp
      extra/yassl/taocrypt/src/algebra.cpp
      extra/yassl/taocrypt/src/asn.cpp
      heap/hp_write.c
      include/my_global.h
      include/my_md5.h
      include/my_sys.h
      innobase/include/pars0pars.h
      innobase/pars/pars0pars.c
      innobase/rem/rem0cmp.c
      libmysql/libmysql.c
      libmysql/manager.c
      myisam/mi_check.c
      myisam/mi_open.c
      myisam/mi_packrec.c
      myisam/mi_search.c
      myisam/rt_index.c
      mysql-test/include/ndb_backup.inc
      mysql-test/include/wait_until_count_sessions.inc
      mysql-test/r/consistent_snapshot.result
      mysql-test/r/ctype_collate.result
      mysql-test/r/dirty_close.result
      mysql-test/r/explain.result
      mysql-test/r/federated.result
      mysql-test/r/flush_block_commit.result
      mysql-test/r/flush_block_commit_notembedded.result
      mysql-test/r/flush_read_lock_kill.result
      mysql-test/r/lock_multi.result
      mysql-test/r/myisampack.result
      mysql-test/r/mysqlbinlog.result
      mysql-test/r/mysqldump.result
      mysql-test/r/ndb_restore.result
      mysql-test/r/ndb_restore_print.result
      mysql-test/r/read_only.result
      mysql-test/r/rpl_timezone.result
      mysql-test/r/shm.result
      mysql-test/r/show_check.result
      mysql-test/r/skip_name_resolve.result
      mysql-test/r/sp-security.result
      mysql-test/r/union.result
      mysql-test/r/view.result
      mysql-test/r/view_grant.result
      mysql-test/suite/funcs_1/r/innodb_func_view.result
      mysql-test/suite/funcs_1/r/innodb_views.result
      mysql-test/suite/funcs_1/r/myisam_views.result
      mysql-test/t/alter_table-big.test
      mysql-test/t/connect.test
      mysql-test/t/consistent_snapshot.test
      mysql-test/t/ctype_collate.test
      mysql-test/t/dirty_close.test
      mysql-test/t/explain.test
      mysql-test/t/federated.test
      mysql-test/t/flush_block_commit.test
      mysql-test/t/flush_block_commit_notembedded.test
      mysql-test/t/flush_read_lock_kill.test
      mysql-test/t/init_connect.test
      mysql-test/t/lock_multi.test
      mysql-test/t/myisampack.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/mysqldump.test
      mysql-test/t/mysqltest.test
      mysql-test/t/read_only.test
      mysql-test/t/rpl_timezone.test
      mysql-test/t/shm.test
      mysql-test/t/show_check.test
      mysql-test/t/skip_name_resolve.test
      mysql-test/t/sp-security.test
      mysql-test/t/sp_notembedded.test
      mysql-test/t/ssl-big.test
      mysql-test/t/ssl.test
      mysql-test/t/ssl_compress.test
      mysql-test/t/status.test
      mysql-test/t/type_bit_innodb.test
      mysql-test/t/union.test
      mysql-test/t/user_limits.test
      mysql-test/t/view.test
      mysql-test/t/view_grant.test
      mysql-test/t/wait_timeout.test
      mysql-test/t/xa.test
      mysys/base64.c
      mysys/default.c
      mysys/errors.c
      mysys/md5.c
      mysys/mf_iocache2.c
      mysys/my_fstream.c
      mysys/my_new.cc
      mysys/my_pread.c
      mysys/my_static.c
      mysys/my_write.c
      mysys/safemalloc.c
      mysys/string.c
      server-tools/instance-manager/buffer.cc
      server-tools/instance-manager/commands.cc
      server-tools/instance-manager/instance.cc
      server-tools/instance-manager/instance_map.cc
      server-tools/instance-manager/instance_options.cc
      server-tools/instance-manager/listener.cc
      server-tools/instance-manager/mysql_connection.cc
      server-tools/instance-manager/options.cc
      server-tools/instance-manager/parse.cc
      server-tools/instance-manager/parse.h
      server-tools/instance-manager/parse_output.cc
      server-tools/instance-manager/protocol.cc
      server-tools/instance-manager/user_map.cc
      sql-common/client.c
      sql-common/my_user.c
      sql/gen_lex_hash.cc
      sql/ha_archive.cc
      sql/ha_federated.cc
      sql/ha_innodb.cc
      sql/handler.cc
      sql/item.cc
      sql/item_func.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/lock.cc
      sql/log.cc
      sql/log_event.cc
      sql/mysqld.cc
      sql/net_serv.cc
      sql/opt_range.cc
      sql/opt_sum.cc
      sql/parse_file.cc
      sql/protocol.cc
      sql/set_var.cc
      sql/slave.cc
      sql/sp.cc
      sql/sp_head.cc
      sql/spatial.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_crypt.cc
      sql/sql_db.cc
      sql/sql_derived.cc
      sql/sql_error.cc
      sql/sql_handler.cc
      sql/sql_help.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_repl.cc
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_string.cc
      sql/sql_table.cc
      sql/sql_trigger.cc
      sql/sql_udf.cc
      sql/sql_view.cc
      sql/table.cc
      sql/tztime.cc
      sql/udf_example.c
      sql/uniques.cc
      sql/unireg.cc
      strings/Makefile.am
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-ucs2.c
      strings/my_vsnprintf.c
      strings/xml.c
      tests/bug25714.c
      tests/mysql_client_test.c
      tools/mysqlmanager.c
      vio/viosocket.c
=== modified file 'mysql-test/r/innodb_mysql.result'
--- a/mysql-test/r/innodb_mysql.result	2009-02-20 09:12:06 +0000
+++ b/mysql-test/r/innodb_mysql.result	2009-03-27 06:24:32 +0000
@@ -1267,4 +1267,28 @@ CREATE INDEX i1 on t1 (a(3));
 SELECT * FROM t1 WHERE a = 'abcde';
 a
 DROP TABLE t1;
+#
+# BUG #26288: savepoint are not deleted on comit, if the transaction 
+# was otherwise empty
+#
+BEGIN;
+SAVEPOINT s1;
+COMMIT;
+RELEASE SAVEPOINT s1;
+ERROR 42000: SAVEPOINT s1 does not exist
+BEGIN;
+SAVEPOINT s2;
+COMMIT;
+ROLLBACK TO SAVEPOINT s2;
+ERROR 42000: SAVEPOINT s2 does not exist
+BEGIN;
+SAVEPOINT s3;
+ROLLBACK;
+RELEASE SAVEPOINT s3;
+ERROR 42000: SAVEPOINT s3 does not exist
+BEGIN;
+SAVEPOINT s4;
+ROLLBACK;
+ROLLBACK TO SAVEPOINT s4;
+ERROR 42000: SAVEPOINT s4 does not exist
 End of 5.0 tests

=== modified file 'mysql-test/t/innodb_mysql.test'
--- a/mysql-test/t/innodb_mysql.test	2009-02-20 09:12:06 +0000
+++ b/mysql-test/t/innodb_mysql.test	2009-03-27 06:24:32 +0000
@@ -1025,4 +1025,33 @@ CREATE INDEX i1 on t1 (a(3)); 
 SELECT * FROM t1 WHERE a = 'abcde'; 
 DROP TABLE t1;
 
+
+--echo #
+--echo # BUG #26288: savepoint are not deleted on comit, if the transaction 
+--echo # was otherwise empty
+--echo #
+BEGIN;
+SAVEPOINT s1;
+COMMIT;
+--error 1305
+RELEASE SAVEPOINT s1;
+
+BEGIN;
+SAVEPOINT s2;
+COMMIT;
+--error 1305
+ROLLBACK TO SAVEPOINT s2;
+
+BEGIN;
+SAVEPOINT s3;
+ROLLBACK;
+--error 1305
+RELEASE SAVEPOINT s3;
+
+BEGIN;
+SAVEPOINT s4;
+ROLLBACK;
+--error 1305
+ROLLBACK TO SAVEPOINT s4;
+
 --echo End of 5.0 tests

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2009-02-10 22:47:54 +0000
+++ b/sql/handler.cc	2009-03-27 06:24:32 +0000
@@ -730,6 +730,16 @@ end:
     if (is_real_trans)
       start_waiting_global_read_lock(thd);
   }
+  else if (all)
+  {
+    /*
+      A COMMIT of an empty transaction. There may be savepoints.
+      Destroy them. If the transaction is not empty
+      savepoints are cleared in ha_commit_one_phase()
+      or ha_rollback_trans().
+    */
+    thd->transaction.cleanup();
+  }
 #endif /* USING_TRANSACTIONS */
   DBUG_RETURN(error);
 }
@@ -825,11 +835,11 @@ int ha_rollback_trans(THD *thd, bool all
         thd->transaction.xid_state.xid.null();
     }
     if (all)
-    {
       thd->variables.tx_isolation=thd->session_tx_isolation;
-      thd->transaction.cleanup();
-    }
   }
+  /* Always cleanup. Even if there nht==0. There may be savepoints. */
+  if (all)
+    thd->transaction.cleanup();
 #endif /* USING_TRANSACTIONS */
   if (all)
     thd->transaction_rollback_request= FALSE;


Attachment: [text/bzr-bundle] bzr/[e-mail]