bzr commit into mysql-6.0-bugteam branch (joro:3283)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/merge-6.0-bugteam/ based on revid:joro@stripped

 3283 Georgi Kodinov	2009-05-15 [merge]
      merged 5.1-bugteam -> 6.0-bugteam

    modified:
      .bzr-mysql/default.conf
      sql/sql_parse.cc
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-05-14 16:17:29 +0000
+++ b/.bzr-mysql/default.conf	2009-05-15 13:45:06 +0000
@@ -2,4 +2,4 @@
 tree_location = "bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0"
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-6.0"
+tree_name = "mysql-6.0-bugteam"

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2009-05-15 13:38:06 +0000
+++ b/sql/sql_parse.cc	2009-05-15 13:45:06 +0000
@@ -4149,6 +4149,11 @@ end_with_restore_list:
     DEBUG_SYNC(thd, "before_begin_trans");
     if (trans_begin(thd, lex->start_transaction_opt))
       goto error;
+    if (lex->start_transaction_opt & MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT)
+    {
+      if (ha_start_consistent_snapshot(thd))
+        goto error;
+    }
     my_ok(thd);
     break;
   case SQLCOM_COMMIT:


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